diff --git a/app/assets/stylesheets/check_all_none.scss b/app/assets/stylesheets/check_all_none.scss
index b1ba5fbab..c06237a57 100644
--- a/app/assets/stylesheets/check_all_none.scss
+++ b/app/assets/stylesheets/check_all_none.scss
@@ -1,7 +1,17 @@
 .check-all-none {
   float: $global-left;
+  list-style-type: none;
+  margin-#{$global-left}: 0;
 
   button {
     @include link;
   }
+
+  li {
+    display: inline-block;
+
+    + li::before {
+      @include vertical-separator;
+    }
+  }
 }
diff --git a/app/components/moderation/shared/index_component.html.erb b/app/components/moderation/shared/index_component.html.erb
index 228a3fcab..67d30d8ef 100644
--- a/app/components/moderation/shared/index_component.html.erb
+++ b/app/components/moderation/shared/index_component.html.erb
@@ -9,12 +9,10 @@
 <% end %>
 
 <%= form_tag form_path, method: :put do %>
-  <p class="check-all-none">
-    <%= t("shared.check") %>:
-    <%= button_tag t("shared.check_all"), type: "button", data: { check_all: field_name } %>
-    |
-    <%= button_tag t("shared.check_none"), type: "button", data: { check_none: field_name } %>
-  </p>
+  <ul class="check-all-none">
+    <li><%= button_tag t("shared.check_all"), type: "button", data: { check_all: field_name } %></li>
+    <li><%= button_tag t("shared.check_none"), type: "button", data: { check_none: field_name } %></li>
+  </ul>
 
   <%= content %>
 
diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml
index 755d67391..da77b6942 100644
--- a/config/locales/en/general.yml
+++ b/config/locales/en/general.yml
@@ -674,9 +674,8 @@ en:
       author_deleted: User deleted
       email_deleted: Email deleted
     back: Go back
-    check: Select
-    check_all: All
-    check_none: None
+    check_all: Select all
+    check_none: Select none
     collective: Collective
     flag: Flag as inappropriate
     follow: "Follow"
diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml
index d8b03580f..1ae7aa62f 100644
--- a/config/locales/es/general.yml
+++ b/config/locales/es/general.yml
@@ -674,9 +674,8 @@ es:
       author_deleted: Usuario eliminado
       email_deleted: Email eliminado
     back: Volver
-    check: Seleccionar
-    check_all: Todos
-    check_none: Ninguno
+    check_all: Seleccionar todos
+    check_none: Seleccionar ninguno
     collective: Colectivo
     flag: Denunciar como inapropiado
     follow: "Seguir"
diff --git a/spec/system/moderation/budget_investments_spec.rb b/spec/system/moderation/budget_investments_spec.rb
index 73602d839..ad1bb0460 100644
--- a/spec/system/moderation/budget_investments_spec.rb
+++ b/spec/system/moderation/budget_investments_spec.rb
@@ -109,11 +109,11 @@ describe "Moderate budget investments" do
 
         expect(page).to have_field type: :checkbox, count: 3
 
-        within(".check-all-none") { click_button "All" }
+        within(".check-all-none") { click_button "Select all" }
 
         expect(all(:checkbox)).to all(be_checked)
 
-        within(".check-all-none") { click_button "None" }
+        within(".check-all-none") { click_button "Select none" }
 
         all(:checkbox).each { |checkbox| expect(checkbox).not_to be_checked }
       end
diff --git a/spec/system/moderation/comments_spec.rb b/spec/system/moderation/comments_spec.rb
index e90ecdc79..3c1b8fd1a 100644
--- a/spec/system/moderation/comments_spec.rb
+++ b/spec/system/moderation/comments_spec.rb
@@ -130,11 +130,11 @@ describe "Moderate comments" do
 
         expect(page).to have_field type: :checkbox, count: 2
 
-        within(".check-all-none") { click_button "All" }
+        within(".check-all-none") { click_button "Select all" }
 
         expect(all(:checkbox)).to all(be_checked)
 
-        within(".check-all-none") { click_button "None" }
+        within(".check-all-none") { click_button "Select none" }
 
         all(:checkbox).each { |checkbox| expect(checkbox).not_to be_checked }
       end
diff --git a/spec/system/moderation/debates_spec.rb b/spec/system/moderation/debates_spec.rb
index 311b670c3..df8ecf168 100644
--- a/spec/system/moderation/debates_spec.rb
+++ b/spec/system/moderation/debates_spec.rb
@@ -99,11 +99,11 @@ describe "Moderate debates" do
 
         expect(page).to have_field type: :checkbox, count: 2
 
-        within(".check-all-none") { click_button "All" }
+        within(".check-all-none") { click_button "Select all" }
 
         expect(all(:checkbox)).to all(be_checked)
 
-        within(".check-all-none") { click_button "None" }
+        within(".check-all-none") { click_button "Select none" }
 
         all(:checkbox).each { |checkbox| expect(checkbox).not_to be_checked }
       end
diff --git a/spec/system/moderation/proposal_notifications_spec.rb b/spec/system/moderation/proposal_notifications_spec.rb
index 0a1495988..fec1a74fe 100644
--- a/spec/system/moderation/proposal_notifications_spec.rb
+++ b/spec/system/moderation/proposal_notifications_spec.rb
@@ -110,11 +110,11 @@ describe "Moderate proposal notifications" do
 
         expect(page).to have_field type: :checkbox, count: 2
 
-        within(".check-all-none") { click_button "All" }
+        within(".check-all-none") { click_button "Select all" }
 
         expect(all(:checkbox)).to all(be_checked)
 
-        within(".check-all-none") { click_button "None" }
+        within(".check-all-none") { click_button "Select none" }
 
         all(:checkbox).each { |checkbox| expect(checkbox).not_to be_checked }
       end
diff --git a/spec/system/moderation/proposals_spec.rb b/spec/system/moderation/proposals_spec.rb
index 05bee0ecc..6fb8ce02d 100644
--- a/spec/system/moderation/proposals_spec.rb
+++ b/spec/system/moderation/proposals_spec.rb
@@ -98,11 +98,11 @@ describe "Moderate proposals" do
 
         expect(page).to have_field type: :checkbox, count: 3
 
-        within(".check-all-none") { click_button "All" }
+        within(".check-all-none") { click_button "Select all" }
 
         expect(all(:checkbox)).to all(be_checked)
 
-        within(".check-all-none") { click_button "None" }
+        within(".check-all-none") { click_button "Select none" }
 
         all(:checkbox).each { |checkbox| expect(checkbox).not_to be_checked }
       end