diff --git a/app/components/admin/budget_phases/form_component.html.erb b/app/components/admin/budget_phases/form_component.html.erb
index 369373454..d9b494220 100644
--- a/app/components/admin/budget_phases/form_component.html.erb
+++ b/app/components/admin/budget_phases/form_component.html.erb
@@ -56,8 +56,8 @@
   <% end %>
 
   <% if feature?(:allow_images) %>
-    <div class="images small-12 column">
-      <%= render "images/nested_image", f: f %>
+    <div class="small-12 column">
+      <%= render Images::NestedComponent.new(f) %>
       <p class="help-text"><%= t("admin.budget_phases.edit.image_description") %></p>
     </div>
   <% end %>
diff --git a/app/components/admin/budgets/form_component.html.erb b/app/components/admin/budgets/form_component.html.erb
index 38cc4e6f6..0f958d4d9 100644
--- a/app/components/admin/budgets/form_component.html.erb
+++ b/app/components/admin/budgets/form_component.html.erb
@@ -54,8 +54,8 @@
     <% end %>
 
     <% if feature?(:allow_images) %>
-      <div class="images small-12 column">
-        <%= render "/images/nested_image", f: f %>
+      <div class="small-12 column">
+        <%= render Images::NestedComponent.new(f) %>
         <p class="help-text"><%= t("admin.budgets.edit.image_description") %></p>
       </div>
     <% end %>
diff --git a/app/components/admin/poll/questions/answers/documents/index_component.html.erb b/app/components/admin/poll/questions/answers/documents/index_component.html.erb
index b23f46ef2..627159982 100644
--- a/app/components/admin/poll/questions/answers/documents/index_component.html.erb
+++ b/app/components/admin/poll/questions/answers/documents/index_component.html.erb
@@ -12,9 +12,7 @@
     <%= form_for(Poll::Question::Answer.new, url: admin_answer_documents_path(answer)) do |f| %>
       <%= render "shared/errors", resource: answer %>
 
-      <div class="documents">
-        <%= render "documents/nested_documents", f: f %>
-      </div>
+      <%= render Documents::NestedComponent.new(f) %>
 
       <div class="small-12 medium-6 large-2">
         <%= f.submit(class: "button expanded", value: t("shared.save")) %>
diff --git a/app/components/budgets/investments/form_component.html.erb b/app/components/budgets/investments/form_component.html.erb
index daa0aec4a..228aec322 100644
--- a/app/components/budgets/investments/form_component.html.erb
+++ b/app/components/budgets/investments/form_component.html.erb
@@ -37,15 +37,11 @@
     <legend><%= t("shared.optional") %></legend>
 
     <% if feature?(:allow_images) %>
-      <div class="images">
-        <%= render "images/nested_image", f: f %>
-      </div>
+      <%= render Images::NestedComponent.new(f) %>
     <% end %>
 
     <% if feature?(:allow_attached_documents) %>
-      <div class="documents">
-        <%= render "documents/nested_documents", f: f %>
-      </div>
+      <%= render Documents::NestedComponent.new(f) %>
     <% end %>
 
     <% if feature?(:map) %>
diff --git a/app/components/documents/nested_component.html.erb b/app/components/documents/nested_component.html.erb
index 743cd7be3..d47185ae8 100644
--- a/app/components/documents/nested_component.html.erb
+++ b/app/components/documents/nested_component.html.erb
@@ -1,4 +1,4 @@
-<fieldset class="documents-list">
+<fieldset class="documents-list documents">
   <legend><%= t("documents.form.title") %></legend>
   <p class="help-text"><%= note %></p>
 
diff --git a/app/components/images/nested_component.html.erb b/app/components/images/nested_component.html.erb
index 0505ea4de..578cb53fe 100644
--- a/app/components/images/nested_component.html.erb
+++ b/app/components/images/nested_component.html.erb
@@ -1,4 +1,4 @@
-<fieldset>
+<fieldset class="images">
   <legend><%= t("images.form.title") %></legend>
   <p class="help-text"><%= note %></p>
 
diff --git a/app/components/proposals/form_component.html.erb b/app/components/proposals/form_component.html.erb
index f6084f3b8..fddca56bb 100644
--- a/app/components/proposals/form_component.html.erb
+++ b/app/components/proposals/form_component.html.erb
@@ -38,15 +38,11 @@
     </div>
 
     <% if feature?(:allow_images) %>
-      <div class="images">
-        <%= render "images/nested_image", f: f %>
-      </div>
+      <%= render Images::NestedComponent.new(f) %>
     <% end %>
 
     <% if feature?(:allow_attached_documents) %>
-      <div class="documents">
-        <%= render "documents/nested_documents", f: f %>
-      </div>
+      <%= render Documents::NestedComponent.new(f) %>
     <% end %>
 
     <% if Geozone.any? %>
diff --git a/app/views/admin/dashboard/actions/_form.html.erb b/app/views/admin/dashboard/actions/_form.html.erb
index f479f6ad7..3dd147172 100644
--- a/app/views/admin/dashboard/actions/_form.html.erb
+++ b/app/views/admin/dashboard/actions/_form.html.erb
@@ -64,8 +64,8 @@
 </div>
 
 <% if feature?(:allow_attached_documents) %>
-  <div class="documents small-12 column">
-    <%= render "documents/nested_documents", f: f %>
+  <div class="small-12 column">
+    <%= render Documents::NestedComponent.new(f) %>
   </div>
 <% end %>
 
diff --git a/app/views/admin/legislation/processes/_form.html.erb b/app/views/admin/legislation/processes/_form.html.erb
index 0fe41f941..0f461bfd7 100644
--- a/app/views/admin/legislation/processes/_form.html.erb
+++ b/app/views/admin/legislation/processes/_form.html.erb
@@ -109,12 +109,12 @@
   </fieldset>
 
   <div class="row">
-    <div class="documents small-12 column">
-      <%= render "documents/nested_documents", f: f %>
+    <div class="small-12 column">
+      <%= render Documents::NestedComponent.new(f) %>
     </div>
 
-    <div class="images small-12 column">
-      <%= render "images/nested_image", f: f %>
+    <div class="small-12 column">
+      <%= render Images::NestedComponent.new(f) %>
     </div>
 
     <div class="small-12 column">
diff --git a/app/views/admin/milestones/_form.html.erb b/app/views/admin/milestones/_form.html.erb
index 7198f1c93..2d7d6b2a1 100644
--- a/app/views/admin/milestones/_form.html.erb
+++ b/app/views/admin/milestones/_form.html.erb
@@ -27,11 +27,8 @@
     <div class="column">
       <%= f.date_field :publication_date %>
 
-      <%= render "images/nested_image", f: f %>
-
-      <div class="documents">
-        <%= render "documents/nested_documents", f: f %>
-      </div>
+      <%= render Images::NestedComponent.new(f) %>
+      <%= render Documents::NestedComponent.new(f) %>
 
       <%= f.submit nil, class: "button success" %>
     </div>
diff --git a/app/views/admin/poll/polls/_form.html.erb b/app/views/admin/poll/polls/_form.html.erb
index dd0b59292..332011a20 100644
--- a/app/views/admin/poll/polls/_form.html.erb
+++ b/app/views/admin/poll/polls/_form.html.erb
@@ -32,8 +32,8 @@
   </div>
 
   <div class="row">
-    <div class="images small-12 column">
-      <%= render "images/nested_image", f: f %>
+    <div class="small-12 column">
+      <%= render Images::NestedComponent.new(f) %>
     </div>
 
     <div class="clear">
diff --git a/app/views/admin/poll/questions/answers/images/new.html.erb b/app/views/admin/poll/questions/answers/images/new.html.erb
index e4ddaa769..3c85c0b57 100644
--- a/app/views/admin/poll/questions/answers/images/new.html.erb
+++ b/app/views/admin/poll/questions/answers/images/new.html.erb
@@ -2,9 +2,7 @@
   <%= form_for(@answer, url: admin_answer_images_path(@answer), method: :post) do |f| %>
     <%= render "shared/errors", resource: @answer %>
 
-    <div class="images">
-      <%= render Images::NestedComponent.new(f, image_fields: :images) %>
-    </div>
+    <%= render Images::NestedComponent.new(f, image_fields: :images) %>
 
     <%= f.submit t("admin.questions.answers.images.save_image"), class: "button success" %>
   <% end %>
diff --git a/app/views/admin/widget/cards/_form.html.erb b/app/views/admin/widget/cards/_form.html.erb
index 606697f4d..d01dc0cc1 100644
--- a/app/views/admin/widget/cards/_form.html.erb
+++ b/app/views/admin/widget/cards/_form.html.erb
@@ -45,7 +45,7 @@
   <div class="row">
     <div class="image-form">
       <div class="image small-12 column">
-        <%= render "images/nested_image", f: f %>
+        <%= render Images::NestedComponent.new(f) %>
       </div>
     </div>
     <div class="column">
diff --git a/app/views/documents/_nested_documents.html.erb b/app/views/documents/_nested_documents.html.erb
deleted file mode 100644
index 229840e83..000000000
--- a/app/views/documents/_nested_documents.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= render Documents::NestedComponent.new(f) %>
diff --git a/app/views/images/_nested_image.html.erb b/app/views/images/_nested_image.html.erb
deleted file mode 100644
index c55ccaa56..000000000
--- a/app/views/images/_nested_image.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= render Images::NestedComponent.new(f) %>
diff --git a/app/views/legislation/proposals/_form.html.erb b/app/views/legislation/proposals/_form.html.erb
index 69a699bf5..b1cf5d8b4 100644
--- a/app/views/legislation/proposals/_form.html.erb
+++ b/app/views/legislation/proposals/_form.html.erb
@@ -27,13 +27,13 @@
     </div>
 
     <% if feature?(:allow_images) %>
-      <div class="images small-12 column">
-        <%= render "images/nested_image", f: f %>
+      <div class="small-12 column">
+        <%= render Images::NestedComponent.new(f) %>
       </div>
     <% end %>
 
-    <div class="documents small-12 column">
-      <%= render "documents/nested_documents", f: f %>
+    <div class="small-12 column">
+      <%= render Documents::NestedComponent.new(f) %>
     </div>
 
     <% if Geozone.any? %>