diff --git a/app/assets/stylesheets/mixins.scss b/app/assets/stylesheets/mixins.scss
index 89f962eeb..cc8fe9360 100644
--- a/app/assets/stylesheets/mixins.scss
+++ b/app/assets/stylesheets/mixins.scss
@@ -44,28 +44,6 @@
     margin-bottom: $line-height;
   }
 
-  .document-form,
-  .image-form {
-
-    .title{
-      margin-bottom: $line-height;
-    }
-
-    .document,
-    .image-form {
-      .file-name {
-        margin-top: 0;
-      }
-    }
-
-    .document,
-    .image {
-      .loading-bar.errors {
-        margin-top: $line-height * 2;
-      }
-    }
-  }
-
   .document,
   .image {
 
@@ -107,12 +85,10 @@
 
     &.complete {
       background-color: $success-color;
-      width: 100%;
     }
 
     &.errors {
       background-color: $alert-color;
-      width: 100%;
       margin-top: $line-height / 2;
     }
   }
diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss
index 84e16ebe9..fbcda0ebb 100644
--- a/app/assets/stylesheets/participation.scss
+++ b/app/assets/stylesheets/participation.scss
@@ -249,11 +249,8 @@
 .proposal-form,
 .budget-investment-form,
 .spending-proposal-form,
-.document-form,
 .topic-new,
-.topic-form,
-.image-form,
-.proposal .image-form {
+.topic-form {
 
   .icon-debates,
   .icon-proposals,
@@ -305,9 +302,7 @@
 
 .proposal-form,
 .topic-form,
-.topic-new,
-.document-form,
-.image-form {
+.topic-new {
 
   .recommendations li::before {
     color: $proposals;
@@ -317,8 +312,6 @@
 .budget-investment-new,
 .proposal-form,
 .proposal-edit,
-.image-form,
-.document-form,
 .new_poll_question,
 .edit_poll_question {
   @include direct-uploads;
@@ -856,12 +849,6 @@
   display: none;
 }
 
-.document-form {
-  max-width: 75rem;
-  margin-left: auto;
-  margin-right: auto;
-}
-
 .more-info {
   clear: both;
   color: $text-medium;
diff --git a/app/controllers/documents_controller.rb b/app/controllers/documents_controller.rb
index 73e90eb68..001d23446 100644
--- a/app/controllers/documents_controller.rb
+++ b/app/controllers/documents_controller.rb
@@ -1,24 +1,8 @@
 class DocumentsController < ApplicationController
   before_action :authenticate_user!
-  before_action :find_documentable, except: :destroy
-  before_action :prepare_new_document, only: [:new]
-  before_action :prepare_document_for_creation, only: :create
 
   load_and_authorize_resource
 
-  def new
-  end
-
-  def create
-    if @document.save
-      flash[:notice] = t "documents.actions.create.notice"
-      redirect_to params[:from]
-    else
-      flash[:alert] = t "documents.actions.create.alert"
-      render :new
-    end
-  end
-
   def destroy
     respond_to do |format|
       format.html do
@@ -39,25 +23,4 @@ class DocumentsController < ApplicationController
     end
   end
 
-  private
-
-  def document_params
-    params.require(:document).permit(:title, :documentable_type, :documentable_id,
-                                     :attachment, :cached_attachment, :user_id)
-  end
-
-  def find_documentable
-    @documentable = params[:documentable_type].constantize.find_or_initialize_by(id: params[:documentable_id])
-  end
-
-  def prepare_new_document
-    @document = Document.new(documentable: @documentable, user_id: current_user.id)
-  end
-
-  def prepare_document_for_creation
-    @document = Document.new(document_params)
-    @document.documentable = @documentable
-    @document.user = current_user
-  end
-
 end
diff --git a/app/controllers/images_controller.rb b/app/controllers/images_controller.rb
index 1bfe6e8cd..e273234f2 100644
--- a/app/controllers/images_controller.rb
+++ b/app/controllers/images_controller.rb
@@ -1,24 +1,8 @@
 class ImagesController < ApplicationController
   before_action :authenticate_user!
-  before_filter :find_imageable, except: :destroy
-  before_filter :prepare_new_image, only: [:new]
-  before_filter :prepare_image_for_creation, only: :create
 
   load_and_authorize_resource
 
-  def new
-  end
-
-  def create
-    if @image.save
-      flash[:notice] = t "images.actions.create.notice"
-      redirect_to params[:from]
-    else
-      flash[:alert] = t "images.actions.create.alert"
-      render :new
-    end
-  end
-
   def destroy
     respond_to do |format|
       format.html do
@@ -39,25 +23,4 @@ class ImagesController < ApplicationController
     end
   end
 
-  private
-
-  def image_params
-    params.require(:image).permit(:title, :imageable_type, :imageable_id,
-                                  :attachment, :cached_attachment, :user_id)
-  end
-
-  def find_imageable
-    @imageable = params[:imageable_type].constantize.find_or_initialize_by(id: params[:imageable_id])
-  end
-
-  def prepare_new_image
-    @image = Image.new(imageable: @imageable)
-  end
-
-  def prepare_image_for_creation
-    @image = Image.new(image_params)
-    @image.imageable = @imageable
-    @image.user = current_user
-  end
-
 end
diff --git a/app/helpers/documentables_helper.rb b/app/helpers/documentables_helper.rb
index b95ea80c6..8d9f85578 100644
--- a/app/helpers/documentables_helper.rb
+++ b/app/helpers/documentables_helper.rb
@@ -1,9 +1,5 @@
 module DocumentablesHelper
 
-  def can_create_document?(documentable)
-    can?(:create, Document.new(documentable: documentable)) && documentable.documents.size < documentable.class.max_documents_allowed
-  end
-
   def documentable_class(documentable)
     documentable.class.name.parameterize('_')
   end
diff --git a/app/helpers/documents_helper.rb b/app/helpers/documents_helper.rb
index 228827516..d7e8d1dea 100644
--- a/app/helpers/documents_helper.rb
+++ b/app/helpers/documents_helper.rb
@@ -1,10 +1,5 @@
 module DocumentsHelper
 
-  def document_note(document)
-    t "documents.new.#{document.documentable.class.name.parameterize.underscore}.note",
-      title: document.documentable.title
-  end
-
   def document_attachment_file_name(document)
     document.attachment_file_name
   end
@@ -40,7 +35,7 @@ module DocumentsHelper
     klass = document.errors[:attachment].any? ? "error" : ""
     klass = document.persisted? || document.cached_attachment.present?  ? " hide" : ""
     html = builder.label :attachment,
-                         t("documents.upload_document"),
+                         t("documents.form.attachment_label"),
                          class: "button hollow #{klass}"
     html += builder.file_field :attachment,
                                label: false,
diff --git a/app/helpers/imageables_helper.rb b/app/helpers/imageables_helper.rb
index e45302792..b1c8059ce 100644
--- a/app/helpers/imageables_helper.rb
+++ b/app/helpers/imageables_helper.rb
@@ -1,9 +1,5 @@
 module ImageablesHelper
 
-  def can_create_image?(imageable)
-    can?(:create, Image.new(imageable: imageable))
-  end
-
   def can_destroy_image?(imageable)
     imageable.image.present? && can?(:destroy, imageable.image)
   end
diff --git a/app/helpers/images_helper.rb b/app/helpers/images_helper.rb
index 79b6dbd1e..4e2bdff0e 100644
--- a/app/helpers/images_helper.rb
+++ b/app/helpers/images_helper.rb
@@ -9,11 +9,6 @@ module ImagesHelper
     end
   end
 
-  def image_note(image)
-    t "images.new.#{image.imageable.class.name.parameterize.underscore}.note",
-      title: image.imageable.title
-  end
-
   def image_first_recommendation(image)
     t "images.#{image.imageable.class.name.parameterize.underscore}.recommendation_one_html",
       title: image.imageable.title
diff --git a/app/models/abilities/administrator.rb b/app/models/abilities/administrator.rb
index 5f0c849e1..4278d4f8d 100644
--- a/app/models/abilities/administrator.rb
+++ b/app/models/abilities/administrator.rb
@@ -74,7 +74,7 @@ module Abilities
       cannot :comment_as_moderator, [::Legislation::Question, Legislation::Annotation]
 
       can [:create, :destroy], Document
-      can [:create, :destroy], Image
+      can [:destroy], Image
       can [:create, :destroy], DirectUpload
     end
   end
diff --git a/app/models/abilities/common.rb b/app/models/abilities/common.rb
index b4248c3b6..e4e92abaf 100644
--- a/app/models/abilities/common.rb
+++ b/app/models/abilities/common.rb
@@ -37,9 +37,9 @@ module Abilities
 
       can [:create, :destroy], Follow
 
-      can [:create, :destroy, :new], Document, documentable: { author_id: user.id }
+      can [:destroy], Document, documentable: { author_id: user.id }
 
-      can [:create, :destroy, :new], Image, imageable: { author_id: user.id }
+      can [:destroy], Image, imageable: { author_id: user.id }
 
       can [:create, :destroy], DirectUpload
 
diff --git a/app/views/budgets/investments/_investment_show.html.erb b/app/views/budgets/investments/_investment_show.html.erb
index 2e9e24b4f..e257de0bb 100644
--- a/app/views/budgets/investments/_investment_show.html.erb
+++ b/app/views/budgets/investments/_investment_show.html.erb
@@ -4,18 +4,6 @@
     <div class="small-12 medium-9 column">
       <%= back_link_to budget_investments_path(investment.budget, heading_id: investment.heading) %>
 
-      <% if can_create_document?(investment) %>
-        <%= link_to t("documents.upload_document"),
-                    new_document_path(documentable_id:investment, documentable_type: investment.class.name, from: request.url),
-                    class: 'button hollow float-right' %>
-      <% end %>
-
-      <% if can_create_image?(investment) %>
-        <%= link_to t("images.upload_image"),
-                    new_image_path(imageable_id:investment, imageable_type: investment.class.name, from: request.url),
-                    class: 'button hollow float-right' %>
-      <% end %>
-
       <% if can_destroy_image?(investment) %>
         <%= link_to t("images.remove_image"),
                     image_path(investment.image, from: request.url),
diff --git a/app/views/documents/_document_fields.html.erb b/app/views/documents/_document_fields.html.erb
index 0931ed246..7d7129df6 100644
--- a/app/views/documents/_document_fields.html.erb
+++ b/app/views/documents/_document_fields.html.erb
@@ -4,7 +4,7 @@
   <%= f.hidden_field :cached_attachment %>
 
   <div class="small-12 column title">
-    <%= f.text_field :title, placeholder: t("documents.new.form.title_placeholder") %>
+    <%= f.text_field :title, placeholder: t("documents.form.title_placeholder") %>
   </div>
 
   <div class="small-12 column attachment-actions">
diff --git a/app/views/documents/_documents.html.erb b/app/views/documents/_documents.html.erb
index e03c8c280..e36d88207 100644
--- a/app/views/documents/_documents.html.erb
+++ b/app/views/documents/_documents.html.erb
@@ -1,6 +1,6 @@
 <% if documents.any? %>
 
-  <% if documents.size == max_documents_allowed && can?(:create, Document) %>
+  <% if documents.size == max_documents_allowed && can?(:destroy, Document) %>
     <div class="row documents-list">
       <div class="small-12 column">
         <div class="callout warning text-center">
diff --git a/app/views/documents/_form.html.erb b/app/views/documents/_form.html.erb
deleted file mode 100644
index 216dbbb3b..000000000
--- a/app/views/documents/_form.html.erb
+++ /dev/null
@@ -1,63 +0,0 @@
-<%= form_for @document,
-             url: documents_path(
-              documentable_type: @document.documentable_type,
-              documentable_id: @document.documentable_id,
-              from: params[:from]
-             ),
-             html: { multipart: true, class: "documentable document-form" } do |f| %>
-
-  <%= render 'shared/errors', resource: @document %>
-
-  <div class="row document direct-upload">
-
-    <%= f.hidden_field :cached_attachment %>
-
-    <div class="small-12 column title">
-      <%= f.text_field :title, placeholder: t("documents.new.form.title_placeholder") %>
-    </div>
-
-    <div class="small-12 column attachment-actions">
-      <div class="small-6 column action-add attachment-errors">
-        <%= f.label :attachment, t("documents.form.attachment_label"), class: 'button hollow' %>
-        <%= f.file_field :attachment,
-                         accept: accepted_content_types_extensions(@document.documentable.class),
-                         label: false,
-                         class: 'js-document-attachment',
-                         data: {
-                           url: direct_uploads_url("direct_upload[resource_type]": @document.documentable_type,
-                                                   "direct_upload[resource_id]": @document.documentable_id,
-                                                   "direct_upload[resource_relation]": "documents"),
-                           cached_attachment_input_field: "document_cached_attachment",
-                           title_input_field: "document_title"
-                         } %>
-
-      </div>
-      <div class="small-6 column action-remove text-right">
-        <% if @document.cached_attachment.present? %>
-          <%= link_to t('documents.form.delete_button'),
-                      direct_upload_destroy_url("direct_upload[resource_type]": @document.documentable_type,
-                                                "direct_upload[resource_id]": @document.documentable_id,
-                                                "direct_upload[resource_relation]": "documents",
-                                                "direct_upload[cached_attachment]": @document.cached_attachment),
-                      method: :delete,
-                      remote: true,
-                      class: "delete remove-cached-attachment" %>
-        <% end %>
-      </div>
-    </div>
-
-    <div class="small-12 column">
-      <p class="file-name">
-        <%= document_attachment_file_name(@document) %>
-      </p>
-    </div>
-
-    <div class="small-12 column">
-      <div class="progress-bar-placeholder"><div class="loading-bar"></div></div>
-    </div>
-
-    <div class="actions small-12 medium-6 large-4 end column">
-      <%= f.submit(t("documents.form.submit_button"), class: "button expanded") %>
-    </div>
-  </div>
-<% end %>
diff --git a/app/views/documents/new.html.erb b/app/views/documents/new.html.erb
deleted file mode 100644
index 49446a513..000000000
--- a/app/views/documents/new.html.erb
+++ /dev/null
@@ -1,28 +0,0 @@
-<div class="document-form <%= documentable_class(@document.documentable.class) %> row">
-
-  <div class="small-12 medium-9 column">
-    <%= back_link_to params[:from] %>
-    <h1><%= t("documents.new.title") %></h1>
-    <p><%= document_note(@document) %></p>
-    <%= render "documents/form", form_url: documents_url %>
-  </div>
-
-  <div class="small-12 medium-3 column">
-    <span class="icon-documents float-right"></span>
-    <h2><%= t("documents.recommendations_title") %></h2>
-    <ul class="recommendations">
-      <li>
-        <%= t "documents.recommendation_one_html",
-                max_documents_allowed: max_documents_allowed(@document.documentable) %>
-      </li>
-      <li>
-        <%= t "documents.recommendation_two_html",
-              accepted_content_types: documentable_humanized_accepted_content_types(@document.documentable.class) %>
-      </li>
-      <li>
-        <%= t "documents.recommendation_three_html",
-              max_file_size: max_file_size(@document.documentable.class) %>
-      </li>
-    </ul>
-  </div>
-</div>
diff --git a/app/views/images/_form.html.erb b/app/views/images/_form.html.erb
deleted file mode 100644
index 8f8cd6995..000000000
--- a/app/views/images/_form.html.erb
+++ /dev/null
@@ -1,65 +0,0 @@
-<%= form_for @image,
-             url: images_path(
-              imageable_type: @image.imageable_type,
-              imageable_id: @image.imageable_id,
-              from: params[:from]
-             ),
-             html: { multipart: true, class: "imageable" } do |f| %>
-
-  <%= render 'shared/errors', resource: @image %>
-
-  <div class="row image direct-upload">
-
-    <%= f.hidden_field :cached_attachment %>
-
-    <div class="small-12 column title">
-      <%= f.text_field :title, placeholder: t("images.new.form.title_placeholder") %>
-    </div>
-
-    <%= render_image(@image, :thumb, false) if @image.attachment.exists? %>
-
-    <div class="attachment-actions">
-      <div class="small-6 column action-add attachment-errors">
-        <%= f.label :attachment, t("images.form.attachment_label"), class: 'button hollow' %>
-        <%= f.file_field :attachment,
-                         accept: imageable_accepted_content_types_extensions,
-                         label: false,
-                         class: 'js-image-attachment',
-                         data: {
-                           url: direct_uploads_url("direct_upload[resource_type]": @image.imageable_type,
-                                                   "direct_upload[resource_id]": @image.imageable_id,
-                                                   "direct_upload[resource_relation]": "image"),
-                           cached_attachment_input_field: "image_cached_attachment",
-                           title_input_field: "image_title"
-                         } %>
-      </div>
-      <div class="small-6 column action-remove text-right">
-        <% if @image.cached_attachment.present? %>
-          <%= link_to t('images.form.delete_button'),
-                      direct_upload_destroy_url("direct_upload[resource_type]": @image.imageable_type,
-                                                "direct_upload[resource_id]": @image.imageable_id,
-                                                "direct_upload[resource_relation]": "image",
-                                                "direct_upload[cached_attachment]": @image.cached_attachment),
-                      method: :delete,
-                      remote: true,
-                      class: "delete remove-cached-attachment" %>
-        <% end %>
-      </div>
-    </div>
-
-    <div class="small-12 column image-attachment">
-      <p class="file-name column">
-        <%= image_attachment_file_name(@image) %>
-      </p>
-    </div>
-
-    <div class="small-12 column">
-      <div class="progress-bar-placeholder"><div class="loading-bar"></div></div>
-    </div>
-
-    <div class="actions small-12 medium-6 large-4 end column">
-      <%= f.submit(t("images.form.submit_button"), class: "button expanded") %>
-    </div>
-
-  </div>
-<% end %>
diff --git a/app/views/images/_image.html.erb b/app/views/images/_image.html.erb
index ca7a95867..1f2494c01 100644
--- a/app/views/images/_image.html.erb
+++ b/app/views/images/_image.html.erb
@@ -2,7 +2,8 @@
   <figure>
     <%= image_tag image.attachment.url(version),
                   class: image_class(image),
-                  alt: image.title %>
+                  alt: image.title,
+                  title: image.title %>
     <% if show_caption %>
       <figcaption class="text-right">
         <em><%= image.title %></em>
diff --git a/app/views/images/_image_fields.html.erb b/app/views/images/_image_fields.html.erb
index d067961d7..10a4cf898 100644
--- a/app/views/images/_image_fields.html.erb
+++ b/app/views/images/_image_fields.html.erb
@@ -4,7 +4,7 @@
   <%= f.hidden_field :cached_attachment %>
 
   <div class="small-12 column title">
-    <%= f.text_field :title, placeholder: t("images.new.form.title_placeholder") %>
+    <%= f.text_field :title, placeholder: t("images.form.title_placeholder") %>
   </div>
 
   <%= render_image(f.object, :thumb, false) if f.object.attachment.exists? %>
diff --git a/app/views/images/new.html.erb b/app/views/images/new.html.erb
deleted file mode 100644
index 8aef6a6ad..000000000
--- a/app/views/images/new.html.erb
+++ /dev/null
@@ -1,30 +0,0 @@
-<div class="<%= imageable_class(@image.imageable) %>">
-
-  <div class="image-form row">
-
-    <div class="small-12 medium-9 column">
-      <%= back_link_to params[:from] %>
-      <h1><%= t("images.new.title") %></h1>
-      <p><%= image_note(@image) %></p>
-      <%= render "form", form_url: images_url %>
-    </div>
-
-    <div class="small-12 medium-3 column">
-      <span class="icon-image icon-proposals float-right"></span>
-      <h2><%= t("images.recommendations_title") %></h2>
-      <ul class="recommendations">
-        <li>
-          <%= image_first_recommendation(@image) %>
-        </li>
-        <li>
-          <%= t "images.recommendation_two_html",
-                accepted_content_types: imageable_humanized_accepted_content_types %>
-        </li>
-        <li>
-          <%= t "images.recommendation_three_html",
-                max_file_size: imageable_max_file_size %>
-        </li>
-      </ul>
-    </div>
-  </div>
-</div>
diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb
index ee7ca6f45..96999ca7d 100644
--- a/app/views/proposals/show.html.erb
+++ b/app/views/proposals/show.html.erb
@@ -108,18 +108,10 @@
       </div>
 
       <aside class="small-12 medium-3 column">
-        <% if can_create_document?(@proposal) || author_of_proposal?(@proposal) || current_editable?(@proposal) ||
-              can_create_image?(@proposal) || can_destroy_image?(@proposal) %>
+        <% if author_of_proposal?(@proposal) || current_editable?(@proposal) || can_destroy_image?(@proposal) %>
           <div class="sidebar-divider"></div>
           <h2><%= t("proposals.show.author") %></h2>
           <div class="show-actions-menu">
-            <% if can_create_document?(@proposal) %>
-              <%= link_to new_document_path(documentable_id: @proposal, documentable_type: @proposal.class.name, from: request.url),
-                          class: 'button hollow expanded' do %>
-                          <span class="icon-document"></span>
-                          <%= t("documents.upload_document") %>
-              <% end %>
-            <% end %>
 
             <% if author_of_proposal?(@proposal) %>
               <%= link_to new_proposal_notification_path(proposal_id: @proposal.id),
@@ -129,14 +121,6 @@
               <% end %>
             <% end %>
 
-            <% if can_create_image?(@proposal) %>
-              <%= link_to new_image_path(imageable_id: @proposal, imageable_type: @proposal.class.name, from: request.url),
-                          class: 'button hollow expanded' do %>
-                          <span class="icon-document"></span>
-                          <%= t("images.upload_image") %>
-              <% end %>
-            <% end %>
-
             <% if can_destroy_image?(@proposal) %>
               <%= link_to image_path(@proposal.image, from: request.url),
                           method: :delete,
diff --git a/config/locales/en/documents.yml b/config/locales/en/documents.yml
index 299852daa..05dc9ad9a 100644
--- a/config/locales/en/documents.yml
+++ b/config/locales/en/documents.yml
@@ -2,42 +2,26 @@ en:
   documents:
     tab: Documents
     no_documents: Don't have uploaded documents
-    upload_document: Upload document
     max_documents_allowed_reached_html: You have reached the maximum number of documents allowed! <strong>You have to delete one before you can upload another.</strong>
 
     form:
       title: Documents
+      title_placeholder: Add a descriptive title for the document
       attachment_label: Choose document
-      submit_button: Upload document
       delete_button: Remove document
       note: "You can upload up to a maximum of %{max_documents_allowed} documents of following content types: %{accepted_content_types}, up to %{max_file_size} MB per file."
       add_new_document: Add new document
 
-    new:
-      title: Upload document
-      budget_investment:
-        note: 'Add new document to your investment project: %{title}'
-      proposal:
-        note: 'Add new document to your proposal: %{title}'
-      form:
-        title_placeholder: Add a descriptive title for the document
-
-    recommendations_title: File upload tips
-    recommendation_one_html: You can upload up to a <strong>maximum of %{max_documents_allowed} documents</strong>.
-    recommendation_two_html: You can upload <strong>%{accepted_content_types}</strong> files.
-    recommendation_three_html: You can upload files up to <strong>%{max_file_size} MB</strong>.
-
     actions:
-      create:
-        notice: Document was created successfully.
-        alert: Cannot create document. Check form errors and try again.
       destroy:
         notice: Document was deleted successfully.
         alert: Cannot destroy document.
         confirm: Are you sure you want to delete the document? This action cannot be undone!
+
     buttons:
       download_document: Dowload file
       destroy_document: Destroy
+
     errors:
       messages:
         in_between: must be in between %{min} and %{max}
diff --git a/config/locales/en/images.yml b/config/locales/en/images.yml
index d54ef79fb..6f16061fa 100644
--- a/config/locales/en/images.yml
+++ b/config/locales/en/images.yml
@@ -1,41 +1,21 @@
 en:
   images:
-    upload_image: Upload image
     remove_image: Remove image
 
     form:
       title: Descriptive image
+      title_placeholder: Add a descriptive title for the image
       attachment_label: Choose image
-      submit_button: Upload image
       delete_button: Remove image
       note: "You can upload one image of following content types: %{accepted_content_types}, up to %{max_file_size} MB."
       add_new_image: Add image
 
-    new:
-      title: Upload image
-      budget_investment:
-        note: 'Add an image to your investment project: %{title}'
-      proposal:
-        note: 'Add an image to your proposal: %{title}'
-      form:
-        title_placeholder: Add a descriptive title for the image
-
-    recommendations_title: File upload tips
-    proposal:
-      recommendation_one_html: Proposals with image attract the attention of users more than those that do not have image. This image will be displayed in the list of proposals and on the proposal page.
-    budget_investment:
-      recommendation_one_html: Investment project with image attract the attention of users more than those that do not have image. This image will be displayed in the list of project investments and on the project investments page.
-    recommendation_two_html: "You can upload images in following formats: <strong>%{accepted_content_types}</strong>."
-    recommendation_three_html: You can upload one image up to <strong>1 MB</strong>.
-
     actions:
-      create:
-        notice: Image was created successfully.
-        alert: Cannot create image. Check form errors and try again.
       destroy:
         notice: Image was deleted successfully.
         alert: Cannot destroy image.
         confirm: Are you sure you want to delete the image? This action cannot be undone!
+
     errors:
       messages:
         in_between: must be in between %{min} and %{max}
diff --git a/config/locales/es/documents.yml b/config/locales/es/documents.yml
index 4b342f478..2afae1be9 100644
--- a/config/locales/es/documents.yml
+++ b/config/locales/es/documents.yml
@@ -7,37 +7,22 @@ es:
 
     form:
       title: Documentos
+      title_placeholder: Añade un título descriptivo para el documento
       attachment_label: Selecciona un documento
-      submit_button: Subir documento
       delete_button: Eliminar documento
       note: "Puedes subir hasta un máximo de %{max_documents_allowed} documentos en los formatos: %{accepted_content_types}, y de hasta %{max_file_size} MB por archivo."
       add_new_document: Añadir nuevo documento
 
-    new:
-      title: Subir un documento
-      budget_investment:
-        note: 'Añade un documento la propuesta de inversión: %{title}.'
-      proposal:
-        note: 'Añade un documento a la propuesta: %{title}.'
-      form:
-        title_placeholder: Añade un título descriptivo para el documento
-
-    recommendations_title: Consejos para subir archivos
-    recommendation_one_html: Puedes subir hasta un máximo de <strong>%{max_documents_allowed} documentos</strong>
-    recommendation_two_html: Sólo puedes subir <strong>archivos %{accepted_content_types}</strong>.
-    recommendation_three_html: Puedes subir archivos de hasta <strong>%{max_file_size}  MB</strong>
-
     actions:
-      create:
-        notice: "El documento se ha creado correctamente."
-        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."
         confirm: "¿Está seguro de que desea eliminar el documento? Esta acción no se puede deshacer!"
+
     buttons:
       download_document: Descargar archivo
       destroy_document: Eliminar
+
     errors:
       messages:
         in_between: debe estar entre %{min} y %{max}
diff --git a/config/locales/es/images.yml b/config/locales/es/images.yml
index 92b6acaf8..869a0824e 100644
--- a/config/locales/es/images.yml
+++ b/config/locales/es/images.yml
@@ -1,41 +1,21 @@
 es:
   images:
-    upload_image: Subir imagen
     remove_image: Eliminar imagen
 
     form:
       title: Imagen descriptiva
       attachment_label: Selecciona una imagen
-      submit_button: Subir imagen
       delete_button: Eliminar imagen
       note: "Puedes subir una imagen en los formatos: %{accepted_content_types}, y de hasta %{max_file_size} MB por archivo."
       add_new_image: Añadir imagen
-
-    new:
-      title: Subir una imagen
-      budget_investment:
-        note: 'Añade una imagen la propuesta de inversión: %{title}.'
-      proposal:
-        note: 'Añade una imagen a la propuesta: %{title}.'
-      form:
-        title_placeholder: Añade un título descriptivo para la imagen
-
-    recommendations_title: Consejos para subir imágenes
-    proposal:
-      recommendation_one_html: Las propuestas con imagen llaman más la atención de los usuarios que las que no tienen imagen. Esta imagen se mostrará en el listado de propuestas y en la página de la propuesta.
-    budget_investment:
-      recommendation_one_html: Las proyectos de inversión con imagen llaman más la atención de los usuarios que las que no tienen imagen. Esta imagen se mostrará en el listado de proyectos de inversión y en la página del proyecto de inversión.
-    recommendation_two_html: "Sólo puedes subir <strong>imágenes en los formatos: %{accepted_content_types}</strong>."
-    recommendation_three_html: Puedes subir una imagen de hasta <strong>1 MB</strong>.
+      title_placeholder: Añade un título descriptivo para la imagen
 
     actions:
-      create:
-        notice: "La imagen se ha creado correctamente."
-        alert: "La imagen no se ha podido crear. Revise los errores del formulario."
       destroy:
         notice: "La imagen se ha eliminado correctamente."
         alert: "La imagen no se ha podido eliminar."
         confirm: "¿Está seguro de que desea eliminar la imagen? Esta acción no se puede deshacer!"
+
     errors:
       messages:
         in_between: debe estar entre %{min} y %{max}
diff --git a/config/routes.rb b/config/routes.rb
index 14a8faf19..1cb2d45b9 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -36,9 +36,6 @@ Rails.application.routes.draw do
   get '/welcome', to: 'welcome#welcome'
   get '/cuentasegura', to: 'welcome#verification', as: :cuentasegura
 
-  concern :imageable do
-    resources :images
-  end
   resources :debates do
     member do
       post :vote
@@ -80,7 +77,7 @@ Rails.application.routes.draw do
 
   resources :budgets, only: [:show, :index] do
     resources :groups, controller: "budgets/groups", only: [:show]
-    resources :investments, controller: "budgets/investments", only: [:index, :new, :create, :show, :destroy], concerns: :imageable do
+    resources :investments, controller: "budgets/investments", only: [:index, :new, :create, :show, :destroy] do
       member do
         post :vote
       end
@@ -100,9 +97,9 @@ Rails.application.routes.draw do
 
   resources :follows, only: [:create, :destroy]
 
-  resources :documents, only: [:new, :create, :destroy]
+  resources :documents, only: [:destroy]
 
-  resources :images, only: [:new, :create, :destroy]
+  resources :images, only: [:destroy]
 
   resources :direct_uploads, only: [:create]
   delete "direct_uploads/destroy", to: "direct_uploads#destroy", as: :direct_upload_destroy
@@ -228,7 +225,7 @@ Rails.application.routes.draw do
         end
       end
 
-      resources :budget_investments, only: [:index, :show, :edit, :update], concerns: :imageable do
+      resources :budget_investments, only: [:index, :show, :edit, :update] do
         resources :budget_investment_milestones
         member { patch :toggle_selection }
       end
diff --git a/spec/models/abilities/administrator_spec.rb b/spec/models/abilities/administrator_spec.rb
index f6a970b94..5a6c4b734 100644
--- a/spec/models/abilities/administrator_spec.rb
+++ b/spec/models/abilities/administrator_spec.rb
@@ -81,24 +81,11 @@ describe "Abilities::Administrator" do
   it { should be_able_to(:valuate, create(:budget_investment, budget: create(:budget, phase: 'valuating'))) }
   it { should be_able_to(:valuate, create(:budget_investment, budget: create(:budget, phase: 'finished'))) }
 
-  it { should be_able_to(:new, proposal_document) }
-  it { should be_able_to(:create, proposal_document) }
   it { should be_able_to(:destroy, proposal_document) }
-
-  it { should be_able_to(:new, budget_investment_document) }
-  it { should be_able_to(:create, budget_investment_document) }
   it { should be_able_to(:destroy, budget_investment_document) }
-
-  it { should be_able_to(:new, poll_question_document) }
-  it { should be_able_to(:create, poll_question_document) }
   it { should be_able_to(:destroy, poll_question_document) }
 
-  it { should be_able_to(:new, proposal_image) }
-  it { should be_able_to(:create, proposal_image) }
   it { should be_able_to(:destroy, proposal_image) }
-
-  it { should be_able_to(:new, budget_investment_image) }
-  it { should be_able_to(:create, budget_investment_image) }
   it { should be_able_to(:destroy, budget_investment_image) }
 
 end
diff --git a/spec/models/abilities/common_spec.rb b/spec/models/abilities/common_spec.rb
index 43596a67d..7f936cfcf 100644
--- a/spec/models/abilities/common_spec.rb
+++ b/spec/models/abilities/common_spec.rb
@@ -92,36 +92,16 @@ describe "Abilities::Common" do
   it { should_not be_able_to(:create, DirectMessage) }
   it { should_not be_able_to(:show,   DirectMessage) }
 
-  it { should be_able_to(:new, own_proposal_document) }
-  it { should be_able_to(:create, own_proposal_document) }
   it { should be_able_to(:destroy, own_proposal_document) }
-
-  it { should_not be_able_to(:new, proposal_document) }
-  it { should_not be_able_to(:create, proposal_document) }
   it { should_not be_able_to(:destroy, proposal_document) }
 
-  it { should be_able_to(:new, own_budget_investment_document) }
-  it { should be_able_to(:create, own_budget_investment_document) }
   it { should be_able_to(:destroy, own_budget_investment_document) }
-
-  it { should_not be_able_to(:new, budget_investment_document) }
-  it { should_not be_able_to(:create, budget_investment_document) }
   it { should_not be_able_to(:destroy, budget_investment_document) }
 
-  it { should be_able_to(:new, own_proposal_image) }
-  it { should be_able_to(:create, own_proposal_image) }
   it { should be_able_to(:destroy, own_proposal_image) }
-
-  it { should_not be_able_to(:new, proposal_image) }
-  it { should_not be_able_to(:create, proposal_image) }
   it { should_not be_able_to(:destroy, proposal_image) }
 
-  it { should be_able_to(:new, own_budget_investment_image) }
-  it { should be_able_to(:create, own_budget_investment_image) }
   it { should be_able_to(:destroy, own_budget_investment_image) }
-
-  it { should_not be_able_to(:new, budget_investment_image) }
-  it { should_not be_able_to(:create, budget_investment_image) }
   it { should_not be_able_to(:destroy, budget_investment_image) }
 
   describe 'flagging content' do
diff --git a/spec/shared/features/documentable.rb b/spec/shared/features/documentable.rb
index 13f3b3141..126573348 100644
--- a/spec/shared/features/documentable.rb
+++ b/spec/shared/features/documentable.rb
@@ -1,7 +1,5 @@
 shared_examples "documentable" do |documentable_factory_name, documentable_path, documentable_path_arguments|
   include ActionView::Helpers
-  include DocumentsHelper
-  include DocumentablesHelper
 
   let!(:administrator)          { create(:user) }
   let!(:user)                   { create(:user) }
@@ -17,372 +15,81 @@ shared_examples "documentable" do |documentable_factory_name, documentable_path,
     end
   end
 
-  context "Show" do
+  context "Show documents tab" do
 
-    scenario "Should not display upload document button when there is no logged user" do
+    let!(:document) { create(:document, documentable: documentable, user: documentable.author)}
+
+    scenario "Should not display maximum number of documents alert when reached for users without document creation permission" do
+      create_list(:document, 2, documentable: documentable)
       visit send(documentable_path, arguments)
 
-      within "##{dom_id(documentable)}" do
-        expect(page).not_to have_link("Upload document")
-      end
-    end
-
-    scenario "Should not display upload document button when maximum number of documents reached " do
-      create_list(:document, 3, documentable: documentable)
-      visit send(documentable_path, arguments)
-
-      within "##{dom_id(documentable)}" do
-        expect(page).not_to have_link("Upload document")
-      end
-    end
-
-    scenario "Should display upload document button when user is logged in and is documentable owner" do
-      login_as(user)
-
-      visit send(documentable_path, arguments)
-
-      within "##{dom_id(documentable)}" do
-        expect(page).to have_link("Upload document")
-      end
-    end
-
-    scenario "Should display upload document button when admin is logged in" do
-      login_as(administrator)
-
-      visit send(documentable_path, arguments)
-
-      within "##{dom_id(documentable)}" do
-        expect(page).to have_link("Upload document")
-      end
-    end
-
-    scenario "Should navigate to new document page when click un upload button" do
-      login_as(user)
-
-      visit send(documentable_path, arguments)
-      click_link "Upload document"
-
-      expect(page).to have_selector("h1", text: "Upload document")
-    end
-
-    describe "Documents tab" do
-
-      let!(:document) { create(:document, documentable: documentable, user: documentable.author)}
-
-      scenario "Should not display maximum number of documents alert when reached for users without document creation permission" do
-        create_list(:document, 2, documentable: documentable)
-        visit send(documentable_path, arguments)
-
-        within "#tab-documents" do
-          expect(page).not_to have_content "You have reached the maximum number of documents allowed! You have to delete one before you can upload another."
-        end
-      end
-
-      scenario "Should display maximum number of documents alert when reached and when current user has document creation permission" do
-        login_as documentable.author
-        create_list(:document, 2, documentable: documentable)
-        visit send(documentable_path, arguments)
-
-        within "#tab-documents" do
-          expect(page).to have_content "You have reached the maximum number of documents allowed! You have to delete one before you can upload another."
-        end
-      end
-
-      scenario "Download action should be able to anyone" do
-        visit send(documentable_path, arguments)
-
-        within "#tab-documents" do
-          expect(page).to have_link("Dowload file")
-        end
-      end
-
-      scenario "Download file link should have blank target attribute" do
-        visit send(documentable_path, arguments)
-
-        within "#tab-documents" do
-          expect(page).to have_selector("a[target=_blank]", text: "Dowload file")
-        end
-      end
-
-      scenario "Download file links should have rel attribute setted to no follow" do
-        visit send(documentable_path, arguments)
-
-        within "#tab-documents" do
-          expect(page).to have_selector("a[rel=nofollow]", text: "Dowload file")
-        end
-      end
-
-      describe "Destroy action" do
-
-        scenario "Should not be able when no user logged in" do
-          visit send(documentable_path, arguments)
-
-          within "#tab-documents" do
-            expect(page).not_to have_link("Destroy")
-          end
-        end
-
-        scenario "Should be able when documentable author is logged in" do
-          login_as documentable.author
-          visit send(documentable_path, arguments)
-
-          within "#tab-documents" do
-            expect(page).to have_link("Destroy")
-          end
-        end
-
-        scenario "Should be able when any administrator logged in" do
-          login_as administrator
-          visit send(documentable_path, arguments)
-
-          within "#tab-documents" do
-            expect(page).to have_link("Destroy")
-          end
-        end
-
-      end
-
-    end
-
-  end
-
-  context "New" do
-
-    scenario "Should not be able for unathenticated users" do
-      visit new_document_path(documentable_type: documentable.class.name,
-                              documentable_id: documentable.id)
-
-      expect(page).to have_content("You must sign in or register to continue.")
-    end
-
-    scenario "Should not be able for other users" do
-      login_as create(:user)
-
-      visit new_document_path(documentable_type: documentable.class.name,
-                              documentable_id: documentable.id)
-
-      expect(page).to have_content("You do not have permission to carry out the action 'new' on document. ")
-    end
-
-    scenario "Should be able to documentable author" do
-      login_as documentable.author
-
-      visit new_document_path(documentable_type: documentable.class.name,
-                              documentable_id: documentable.id)
-
-      expect(page).to have_selector("h1", text: "Upload document")
-    end
-
-    scenario "Should display file name after file selection", :js do
-      login_as documentable.author
-      visit new_document_path(documentable_type: documentable.class.name,
-                              documentable_id: documentable.id)
-
-      attach_file :document_attachment, "spec/fixtures/files/empty.pdf", make_visible: true
-
-      expect(page).to have_content "empty.pdf"
-    end
-
-    scenario "Should not display file name after file selection", :js do
-      login_as documentable.author
-      visit new_document_path(documentable_type: documentable.class.name,
-                              documentable_id: documentable.id)
-
-      attach_document("spec/fixtures/files/logo_header.png", false)
-
-      expect(page).not_to have_content "logo_header.jpg"
-    end
-
-    scenario "Should update loading bar style after valid file upload", :js do
-      login_as documentable.author
-      visit new_document_path(documentable_type: documentable.class.name,
-                              documentable_id: documentable.id)
-
-      attach_document("spec/fixtures/files/empty.pdf", true)
-
-      expect(page).to have_selector ".loading-bar.complete"
-    end
-
-    scenario "Should update loading bar style after unvalid file upload", :js do
-      login_as documentable.author
-      visit new_document_path(documentable_type: documentable.class.name,
-                              documentable_id: documentable.id)
-
-      attach_document("spec/fixtures/files/logo_header.png", false)
-
-      expect(page).to have_selector ".loading-bar.errors"
-    end
-
-    scenario "Should update document title with attachment original file name after valid upload if no title defined by user", :js do
-      login_as documentable.author
-      visit new_document_path(documentable_type: documentable.class.name,
-                              documentable_id: documentable.id)
-
-      attach_document("spec/fixtures/files/empty.pdf", true)
-
-      expect(find("input#document_title").value).to eq("empty.pdf")
-    end
-
-    scenario "Should update document title with attachment original file name after invalid upload if no title defined by user", :js do
-      login_as documentable.author
-      visit new_document_path(documentable_type: documentable.class.name,
-                              documentable_id: documentable.id)
-
-      attach_document("spec/fixtures/files/logo_header.png", false)
-
-      expect(find("input#document_title").value).to be_empty
-    end
-
-    scenario "Should not update document title with attachment original file name after file selection when title already defined by user", :js do
-      login_as documentable.author
-      visit new_document_path(documentable_type: documentable.class.name,
-                              documentable_id: documentable.id)
-
-      fill_in :document_title, with: "My custom title"
-      attach_document("spec/fixtures/files/empty.pdf", true)
-
-      expect(find("input[name='document[title]']").value).to eq("My custom title")
-    end
-
-    scenario "Should update document cached_attachment field after valid file upload", :js do
-      login_as documentable.author
-      visit new_document_path(documentable_type: documentable.class.name,
-                              documentable_id: documentable.id)
-
-      attach_document("spec/fixtures/files/empty.pdf", true)
-
-      expect(page).to have_css("input[name='document[cached_attachment]'][value$='.pdf']", visible: false)
-    end
-
-    scenario "Should not show 'Choose document' button after valid upload", :js do
-      login_as documentable.author
-      visit new_document_path(documentable_type: documentable.class.name,
-                              documentable_id: documentable.id)
-
-      attach_file :document_attachment, "spec/fixtures/files/empty.pdf", make_visible: true
-      sleep 1
-
-      expect(page).not_to have_content "Choose document"
-    end
-
-    scenario "Should show 'Remove document' button after valid upload", :js do
-      login_as documentable.author
-      visit new_document_path(documentable_type: documentable.class.name,
-                              documentable_id: documentable.id)
-
-      attach_file :document_attachment, "spec/fixtures/files/empty.pdf", make_visible: true
-      sleep 1
-
-      expect(page).to have_link("Remove document")
-    end
-
-    scenario "Should show 'Choose document' button after remove valid upload", :js do
-      login_as documentable.author
-      visit new_document_path(documentable_type: documentable.class.name,
-                              documentable_id: documentable.id)
-
-      attach_file :document_attachment, "spec/fixtures/files/empty.pdf", make_visible: true
-      sleep 1
-      click_link "Remove document"
-      sleep 1
-
-      expect(page).to have_content "Choose document"
-    end
-
-    scenario "Should not update document cached_attachment field after unvalid file upload", :js do
-      login_as documentable.author
-      visit new_document_path(documentable_type: documentable.class.name,
-                              documentable_id: documentable.id)
-
-      attach_document("spec/fixtures/files/logo_header.png", false)
-
-      expect(find("input[name='document[cached_attachment]']", visible: false).value).to eq("")
-    end
-
-    scenario "Should show documentable custom recomentations" do
-      login_as documentable.author
-      visit new_document_path(documentable_type: documentable.class.name,
-                              documentable_id: documentable.id,
-                              from: send(documentable_path, arguments))
-
-      expect(page).to have_content "You can upload up to a maximum of #{max_file_size(documentable.class)} documents."
-      expect(page).to have_content "You can upload #{documentable_humanized_accepted_content_types(documentable.class)} files."
-      expect(page).to have_content "You can upload files up to #{max_file_size(documentable.class)} MB."
-    end
-
-  end
-
-  context "Create" do
-
-    scenario "Should show validation errors" do
-      login_as documentable.author
-      visit new_document_path(documentable_type: documentable.class.name,
-                              documentable_id: documentable.id)
-
-      click_on "Upload document"
-
-      expect(page).to have_content "2 errors prevented this Document from being saved: "
-      expect(page).to have_selector "small.error", text: "can't be blank", count: 2
-    end
-
-    scenario "Should show error notice after unsuccessfull document upload" do
-      login_as documentable.author
-
-      visit new_document_path(documentable_type: documentable.class.name,
-                              documentable_id: documentable.id,
-                              from: send(documentable_path, arguments))
-      attach_file :document_attachment, "spec/fixtures/files/empty.pdf"
-      click_on "Upload document"
-
-      expect(page).to have_content "Cannot create document. Check form errors and try again."
-    end
-
-    scenario "Should show success notice after successfull document upload" do
-      login_as documentable.author
-
-      visit new_document_path(documentable_type: documentable.class.name,
-                              documentable_id: documentable.id,
-                              from: send(documentable_path, arguments))
-      fill_in :document_title, with: "Document title"
-      attach_file :document_attachment, "spec/fixtures/files/empty.pdf"
-      click_on "Upload document"
-
-      expect(page).to have_content "Document was created successfully."
-    end
-
-    scenario "Should redirect to documentable path after successfull document upload" do
-      login_as documentable.author
-
-      visit new_document_path(documentable_type: documentable.class.name,
-                              documentable_id: documentable.id,
-                              from: send(documentable_path, arguments))
-      fill_in :document_title, with: "Document title"
-      attach_file :document_attachment, "spec/fixtures/files/empty.pdf"
-      click_on "Upload document"
-
-      within "##{dom_id(documentable)}" do
-        expect(page).to have_selector "h1", text: documentable.title
-      end
-    end
-
-    scenario "Should show new document on documentable documents tab after successfull document upload" do
-      login_as documentable.author
-
-      visit new_document_path(documentable_type: documentable.class.name,
-                              documentable_id: documentable.id,
-                              from: send(documentable_path, arguments))
-      fill_in :document_title, with: "Document title"
-      attach_file :document_attachment, "spec/fixtures/files/empty.pdf"
-      click_on "Upload document"
-
-      expect(page).to have_link "Documents (1)"
       within "#tab-documents" do
-        within "#document_#{Document.last.id}" do
-          expect(page).to have_content "Document title"
-          expect(page).to have_link "Dowload file"
-          expect(page).to have_link "Destroy"
+        expect(page).not_to have_content "You have reached the maximum number of documents allowed! You have to delete one before you can upload another."
+      end
+    end
+
+    scenario "Should display maximum number of documents alert when reached and when current user has document creation permission" do
+      login_as documentable.author
+      create_list(:document, 2, documentable: documentable)
+      visit send(documentable_path, arguments)
+
+      within "#tab-documents" do
+        expect(page).to have_content "You have reached the maximum number of documents allowed! You have to delete one before you can upload another."
+      end
+    end
+
+    scenario "Download action should be able to anyone" do
+      visit send(documentable_path, arguments)
+
+      within "#tab-documents" do
+        expect(page).to have_link("Dowload file")
+      end
+    end
+
+    scenario "Download file link should have blank target attribute" do
+      visit send(documentable_path, arguments)
+
+      within "#tab-documents" do
+        expect(page).to have_selector("a[target=_blank]", text: "Dowload file")
+      end
+    end
+
+    scenario "Download file links should have rel attribute setted to no follow" do
+      visit send(documentable_path, arguments)
+
+      within "#tab-documents" do
+        expect(page).to have_selector("a[rel=nofollow]", text: "Dowload file")
+      end
+    end
+
+    describe "Destroy action" do
+
+      scenario "Should not be able when no user logged in" do
+        visit send(documentable_path, arguments)
+
+        within "#tab-documents" do
+          expect(page).not_to have_link("Destroy")
         end
       end
+
+      scenario "Should be able when documentable author is logged in" do
+        login_as documentable.author
+        visit send(documentable_path, arguments)
+
+        within "#tab-documents" do
+          expect(page).to have_link("Destroy")
+        end
+      end
+
+      scenario "Should be able when any administrator logged in" do
+        login_as administrator
+        visit send(documentable_path, arguments)
+
+        within "#tab-documents" do
+          expect(page).to have_link("Destroy")
+        end
+      end
+
     end
 
   end
diff --git a/spec/shared/features/imageable.rb b/spec/shared/features/imageable.rb
index a6e5ae4ae..418d971c2 100644
--- a/spec/shared/features/imageable.rb
+++ b/spec/shared/features/imageable.rb
@@ -25,7 +25,7 @@ shared_examples "imageable" do |imageable_factory_name, imageable_path, imageabl
 
       visit send(imageable_path, imageable_arguments)
 
-      expect(page).to have_css("img[alt='#{image.title}']")
+      expect(page).to have_css("img[alt='#{image.title}'][title='#{image.title}']")
     end
 
     scenario "Show image title when image exists" do
@@ -36,265 +36,6 @@ shared_examples "imageable" do |imageable_factory_name, imageable_path, imageabl
       expect(page).to have_content image.title
     end
 
-    scenario "Should not display upload image button when there is no logged user" do
-      visit send(imageable_path, imageable_arguments)
-
-      within "##{dom_id(imageable)}" do
-        expect(page).not_to have_link("Upload image")
-      end
-    end
-
-    scenario "Should not display upload image button when maximum number of images reached " do
-      create_list(:image, 3, imageable: imageable)
-      visit send(imageable_path, imageable_arguments)
-
-      within "##{dom_id(imageable)}" do
-        expect(page).not_to have_link("Upload image")
-      end
-    end
-
-    scenario "Should display upload image button when user is logged in and is imageable owner" do
-      login_as(user)
-
-      visit send(imageable_path, imageable_arguments)
-
-      within "##{dom_id(imageable)}" do
-        expect(page).to have_link("Upload image")
-      end
-    end
-
-    scenario "Should display upload image button when admin is logged in" do
-      login_as(administrator)
-
-      visit send(imageable_path, imageable_arguments)
-
-      within "##{dom_id(imageable)}" do
-        expect(page).to have_link("Upload image")
-      end
-    end
-
-    scenario "Should navigate to new image page when click un upload button" do
-      login_as(user)
-
-      visit send(imageable_path, imageable_arguments)
-      click_link  "Upload image"
-
-      expect(page).to have_selector("h1", text: "Upload image")
-    end
-
-  end
-
-  context "New" do
-
-    scenario "Should not be able for unathenticated users" do
-      visit new_image_path(imageable_type: imageable.class.name,
-                           imageable_id: imageable.id)
-
-      expect(page).to have_content("You must sign in or register to continue.")
-    end
-
-    scenario "Should not be able for other users" do
-      login_as create(:user)
-
-      visit new_image_path(imageable_type: imageable.class.name,
-                           imageable_id: imageable.id)
-
-      expect(page).to have_content("You do not have permission to carry out the action 'new' on image.")
-    end
-
-    scenario "Should be able to imageable author" do
-      login_as imageable.author
-
-      visit new_image_path(imageable_type: imageable.class.name,
-                           imageable_id: imageable.id)
-
-      expect(page).to have_selector("h1", text: "Upload image")
-    end
-
-    scenario "Should show imageable custom recomentations" do
-      login_as imageable.author
-      visit new_image_path(imageable_type: imageable.class.name,
-                           imageable_id: imageable.id,
-                           from: send(imageable_path, imageable_arguments))
-
-      expect(page).to have_content(image_first_recommendation(Image.new(imageable: imageable)))
-      expect(page).to have_content "You can upload images in following formats:  #{imageable_humanized_accepted_content_types}."
-      expect(page).to have_content "You can upload one image up to 1 MB."
-    end
-
-    scenario "Should display attachment validation errors after invalid image upload", :js do
-      login_as imageable.author
-      visit new_image_path(imageable_type: imageable.class.name,
-                           imageable_id: imageable.id)
-
-      attach_image("spec/fixtures/files/logo_header.png", false)
-
-      expect(page).to have_css "small.error"
-    end
-
-    scenario "Should display file name after image selection", :js do
-      login_as imageable.author
-      visit new_image_path(imageable_type: imageable.class.name,
-                           imageable_id: imageable.id)
-
-      attach_file :image_attachment, "spec/fixtures/files/empty.pdf", make_visible: true
-
-      expect(page).to have_content "empty.pdf"
-    end
-
-    scenario "Should not display file name after invalid image upload", :js do
-      login_as imageable.author
-      visit new_image_path(imageable_type: imageable.class.name,
-                           imageable_id: imageable.id)
-
-      attach_image("spec/fixtures/files/logo_header.png", false)
-
-      expect(page).not_to have_content "clippy.png"
-    end
-
-    scenario "Should display cached image without caption after valid image upload", :js do
-      login_as imageable.author
-      visit new_image_path(imageable_type: imageable.class.name,
-                           imageable_id: imageable.id)
-
-      attach_image("spec/fixtures/files/clippy.jpg", true)
-
-      expect(page).to have_selector ".loading-bar.complete"
-
-      expect(page).to have_css("figure img")
-      expect(page).not_to have_css("figure figcaption")
-    end
-
-    scenario "Should update loading bar style after valid file upload", :js do
-      login_as imageable.author
-      visit new_image_path(imageable_type: imageable.class.name,
-                           imageable_id: imageable.id)
-
-      attach_image("spec/fixtures/files/clippy.jpg", true)
-
-      expect(page).to have_selector ".loading-bar.complete"
-    end
-
-    scenario "Should update loading bar style after invalid file upload", :js do
-      login_as imageable.author
-      visit new_image_path(imageable_type: imageable.class.name,
-                           imageable_id: imageable.id)
-
-      attach_image("spec/fixtures/files/logo_header.png", false)
-
-      expect(page).to have_selector ".loading-bar.errors"
-    end
-
-    scenario "Should update image title with attachment original file name after valid image upload", :js do
-      login_as imageable.author
-      visit new_image_path(imageable_type: imageable.class.name,
-                           imageable_id: imageable.id)
-
-      attach_image("spec/fixtures/files/clippy.jpg")
-
-      expect(find('input#image_title').value).to eq('clippy.jpg')
-    end
-
-    scenario "Should not update image title with attachment original file name after valid image upload when title already defined by user", :js do
-      login_as imageable.author
-      visit new_image_path(imageable_type: imageable.class.name,
-                           imageable_id: imageable.id)
-
-      fill_in :image_title, with: "My custom title"
-      attach_image("spec/fixtures/files/clippy.jpg")
-
-      expect(find('input#image_title').value).to eq('My custom title')
-    end
-
-    scenario "Should update image cached_attachment field after valid file upload", :js do
-      login_as imageable.author
-      visit new_image_path(imageable_type: imageable.class.name,
-                           imageable_id: imageable.id)
-
-      attach_image("spec/fixtures/files/clippy.jpg", true)
-
-      expect(page).to have_css("input[name='image[cached_attachment]'][value$='.jpg']", visible: false)
-    end
-
-    scenario "Should not update image cached_attachment field after invalid file upload", :js do
-      login_as imageable.author
-      visit new_image_path(imageable_type: imageable.class.name,
-                           imageable_id: imageable.id)
-
-      attach_image("spec/fixtures/files/logo_header.png", false)
-
-      expect(page).to have_selector ".loading-bar.errors"
-      expect(find("input[name='image[cached_attachment]']", visible: false).value).to eq("")
-    end
-
-  end
-
-  context "Create" do
-
-    scenario "Should show validation errors" do
-      login_as imageable.author
-      visit new_image_path(imageable_type: imageable.class.name,
-                           imageable_id: imageable.id)
-
-      click_on "Upload image"
-
-      expect(page).to have_content "3 errors prevented this Image from being saved: "
-      expect(page).to have_selector "small.error", text: "can't be blank", count: 2
-    end
-
-    scenario "Should show error notice after unsuccessfull image upload" do
-      login_as imageable.author
-
-      visit new_image_path(imageable_type: imageable.class.name,
-                           imageable_id: imageable.id,
-                           from: send(imageable_path, imageable_arguments))
-      attach_file :image_attachment, "spec/fixtures/files/empty.pdf"
-      click_on "Upload image"
-
-      expect(page).to have_content "Cannot create image. Check form errors and try again."
-    end
-
-    scenario "Should show success notice after successfull image upload" do
-      login_as imageable.author
-
-      visit new_image_path(imageable_type: imageable.class.name,
-                           imageable_id: imageable.id,
-                           from: send(imageable_path, imageable_arguments))
-      fill_in :image_title, with: "Image title"
-      attach_file :image_attachment, "spec/fixtures/files/clippy.jpg"
-      click_on "Upload image"
-
-      expect(page).to have_content "Image was created successfully."
-    end
-
-    scenario "Should redirect to imageable path after successfull image upload" do
-      login_as imageable.author
-
-      visit new_image_path(imageable_type: imageable.class.name,
-                           imageable_id: imageable.id,
-                           from: send(imageable_path, imageable_arguments))
-      fill_in :image_title, with: "Image title"
-      attach_file :image_attachment, "spec/fixtures/files/clippy.jpg"
-      click_on "Upload image"
-
-      within "##{dom_id(imageable)}" do
-        expect(page).to have_selector "h1", text: imageable.title
-      end
-    end
-
-    scenario "Should show new image on imageable images tab after successfull image upload" do
-      login_as imageable.author
-
-      visit new_image_path(imageable_type: imageable.class.name,
-                           imageable_id: imageable.id,
-                           from: send(imageable_path, imageable_arguments))
-      fill_in :image_title, with: "Image title"
-      attach_file :image_attachment, "spec/fixtures/files/clippy.jpg"
-      click_on "Upload image"
-
-      expect(page).to have_content "Image title"
-    end
-
   end
 
   context "Destroy" do