From 758d9896ecebb827ff712a467935b62212daf0ca Mon Sep 17 00:00:00 2001
From: Hugoren Martinako <aumpfbahn@gmail.com>
Date: Thu, 27 Jul 2023 08:48:10 +0200
Subject: [PATCH 01/14] Place the announcemente inside the layout (#11381)

---
 decidim-blogs/app/views/decidim/blogs/posts/index.html.erb | 4 +++-
 decidim-blogs/app/views/decidim/blogs/posts/show.html.erb  | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/decidim-blogs/app/views/decidim/blogs/posts/index.html.erb b/decidim-blogs/app/views/decidim/blogs/posts/index.html.erb
index da610393e98ca..64357abb7cf55 100644
--- a/decidim-blogs/app/views/decidim/blogs/posts/index.html.erb
+++ b/decidim-blogs/app/views/decidim/blogs/posts/index.html.erb
@@ -1,4 +1,4 @@
-<%= render partial: "decidim/shared/component_announcement" %>
+<%= append_javascript_pack_tag "decidim_blogs" %>
 <%= append_stylesheet_pack_tag "decidim_blogs" %>
 
 <% content_for :aside do %>
@@ -7,6 +7,8 @@
 
 <%= render layout: "layouts/decidim/shared/layout_two_col" do %>
 
+  <%= render partial: "decidim/shared/component_announcement" %>
+
   <div id="blogs" class="space-y-12">
     <% paginate_posts.each do |post| %>
       <%= card_for post, size: :l %>
diff --git a/decidim-blogs/app/views/decidim/blogs/posts/show.html.erb b/decidim-blogs/app/views/decidim/blogs/posts/show.html.erb
index 97b3390d0891a..d59a11b2afcc2 100644
--- a/decidim-blogs/app/views/decidim/blogs/posts/show.html.erb
+++ b/decidim-blogs/app/views/decidim/blogs/posts/show.html.erb
@@ -15,6 +15,7 @@
   )
 %>
 
+<%= append_javascript_pack_tag "decidim_blogs" %>
 <%= append_stylesheet_pack_tag "decidim_blogs" %>
 
 <%= render layout: "layouts/decidim/shared/layout_center", locals: { columns: 8 } do %>

From 2cccaa3947c0ed9d9057c5903910601a546b6e6a Mon Sep 17 00:00:00 2001
From: Hugoren Martinako <aumpfbahn@gmail.com>
Date: Thu, 27 Jul 2023 10:03:09 +0200
Subject: [PATCH 02/14] Redesign: remove data-picker presence from public site
 (#11318)

* remove data-picker presence from public site

* remove any reference to data_picker form the filters_component

* fix linter

* include snippet to disable dropdown based on breakpoint

* disable dropdown for desktop

* Remove param from doc method signature

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>

---------

Co-authored-by: Fernando Blat <fernando@blat.es>
Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>
---
 .../app/packs/src/decidim/redesigned_a11y.js  | 11 +++++++++-
 .../src/decidim/redesigned_form_filter.js     | 21 +------------------
 .../app/packs/src/decidim/redesigned_index.js |  4 ----
 .../app/views/decidim/searches/index.js.erb   |  6 ------
 .../views/decidim/shared/_filters.html.erb    |  2 +-
 .../shared/_layout_user_profile.html.erb      |  2 +-
 6 files changed, 13 insertions(+), 33 deletions(-)

diff --git a/decidim-core/app/packs/src/decidim/redesigned_a11y.js b/decidim-core/app/packs/src/decidim/redesigned_a11y.js
index c3e5879299b91..627a19e43dedd 100644
--- a/decidim-core/app/packs/src/decidim/redesigned_a11y.js
+++ b/decidim-core/app/packs/src/decidim/redesigned_a11y.js
@@ -8,7 +8,7 @@ const createAccordion = (component) => {
   accordionOptions.isMultiSelectable = component.dataset.multiselectable !== "false";
   accordionOptions.isCollapsible = component.dataset.collapsible !== "false";
 
-  // This snippet allows to change a data-attribute based on the current viewport
+  // This snippet allows to change the OPEN data-attribute based on the current viewport
   // Just include the breakpoint where the different value will be applied from.
   // Ex:
   // data-open="false" data-open-md="true"
@@ -29,6 +29,15 @@ const createDropdown = (component) => {
   dropdownOptions.isOpen = component.dataset.open === "true";
   dropdownOptions.autoClose = component.dataset.autoClose === "true";
 
+  // This snippet allows to disable the dropdown based on the current viewport
+  // Just include the breakpoint where the different value will be applied from.
+  // Ex:
+  // data-disabled-md="true"
+  const isDisabled = Object.keys(screens).some((key) => (window.matchMedia(`(min-width: ${screens[key]})`).matches) && Boolean(component.dataset[`disabled-${key}`.replace(/-([a-z])/g, (str) => str[1].toUpperCase())]));
+  if (isDisabled) {
+    return
+  }
+
   if (!component.id) {
     // when component has no id, we enforce to have it one
     component.id = `dropdown-${Math.random().toString(36).substring(7)}`
diff --git a/decidim-core/app/packs/src/decidim/redesigned_form_filter.js b/decidim-core/app/packs/src/decidim/redesigned_form_filter.js
index d1ce21c947f06..9de532f4f1a17 100644
--- a/decidim-core/app/packs/src/decidim/redesigned_form_filter.js
+++ b/decidim-core/app/packs/src/decidim/redesigned_form_filter.js
@@ -10,7 +10,6 @@
 import delayed from "./delayed"
 import CheckBoxesTree from "./redesigned_check_boxes_tree"
 import { registerCallback, unregisterCallback, pushState, replaceState, state } from "./history"
-import DataPicker from "./data_picker"
 
 export default class FormFilterComponent {
   constructor($form) {
@@ -19,7 +18,6 @@ export default class FormFilterComponent {
     this.mounted = false;
     this.changeEvents = true;
     this.theCheckBoxesTree = new CheckBoxesTree();
-    this.theDataPicker = window.theDataPicker || new DataPicker($(".data-picker"));
 
     this._updateInitialState();
     this._onFormChange = delayed(this, this._onFormChange.bind(this));
@@ -190,9 +188,6 @@ export default class FormFilterComponent {
       element.checked = element.indeterminate = false;
     });
     this.$form.find("input[type=radio]").attr("checked", false);
-    this.$form.find(".data-picker").each((_index, picker) => {
-      this.theDataPicker.clear(picker);
-    });
 
     // This ensure the form is reset in a valid state where a fieldset of
     // radio buttons has the first selected.
@@ -205,10 +200,9 @@ export default class FormFilterComponent {
   /**
    * Handles the logic when going back to a previous state in the filter form.
    * @private
-   * @param {Object} currentState - state stored along with location URL
    * @returns {Void} - Returns nothing.
    */
-  _onPopState(currentState) {
+  _onPopState() {
     this.changeEvents = false;
     this._clearForm();
 
@@ -244,14 +238,6 @@ export default class FormFilterComponent {
       });
     }
 
-    // Retrieves picker information for selected values (value, text and link) from the state object
-    $(".data-picker", this.$form).each((_index, picker) => {
-      let pickerState = currentState[picker.id];
-      if (pickerState) {
-        this.theDataPicker.load(picker, pickerState);
-      }
-    })
-
     // Only one instance should submit the form on browser history navigation
     if (this.popStateSubmiter) {
       Rails.fire(this.$form[0], "submit");
@@ -300,11 +286,6 @@ export default class FormFilterComponent {
       path = `${formAction}&${params}`;
     }
 
-    // Stores picker information for selected values (value, text and link) in the currentState object
-    $(".data-picker", this.$form).each((_index, picker) => {
-      currentState[picker.id] = this.theDataPicker.save(picker);
-    })
-
     return [path, currentState];
   }
 
diff --git a/decidim-core/app/packs/src/decidim/redesigned_index.js b/decidim-core/app/packs/src/decidim/redesigned_index.js
index e8e982a9c3780..39896d00932c6 100644
--- a/decidim-core/app/packs/src/decidim/redesigned_index.js
+++ b/decidim-core/app/packs/src/decidim/redesigned_index.js
@@ -69,7 +69,6 @@ import updateExternalDomainLinks from "./external_domain_warning"
 import scrollToLastChild from "./scroll_to_last_child"
 import InputCharacterCounter, { createCharacterCounter } from "./redesigned_input_character_counter"
 import FormValidator from "./form_validator"
-import DataPicker from "./data_picker"
 import FormFilterComponent from "./redesigned_form_filter"
 import addInputEmoji, { EmojiButton } from "./input_emoji"
 import dialogMode from "./dialog_mode"
@@ -94,7 +93,6 @@ window.Decidim = window.Decidim || {
   ExternalLink,
   InputCharacterCounter,
   FormValidator,
-  DataPicker,
   addInputEmoji,
   EmojiButton,
   Dialogs
@@ -112,8 +110,6 @@ Rails.start()
  * @returns {void}
  */
 const initializer = (element = document) => {
-  window.theDataPicker = new DataPicker($(".data-picker"));
-
   let focusContainer = element;
   if (element === document) {
     focusContainer = document.querySelector("body");
diff --git a/decidim-core/app/views/decidim/searches/index.js.erb b/decidim-core/app/views/decidim/searches/index.js.erb
index d7e1f3e61e9e5..00627bdc3778d 100644
--- a/decidim-core/app/views/decidim/searches/index.js.erb
+++ b/decidim-core/app/views/decidim/searches/index.js.erb
@@ -5,9 +5,3 @@ var $count = $('#search-count');
 $results.html('<%= j(cell("decidim/search_results", @sections, params:).show).strip.html_safe %>');
 $filters.html('<%= j(render partial: "filters").strip.html_safe %>');
 $count.html('<%= j(render partial: "count").strip.html_safe %>');
-
-if (window.Decidim.DataPicker) {
-  window.theDataPicker = new window.Decidim.DataPicker($(".data-picker"));
-}
-
-$(document).foundation();
diff --git a/decidim-core/app/views/decidim/shared/_filters.html.erb b/decidim-core/app/views/decidim/shared/_filters.html.erb
index 731706a13d85b..c7bde35f991f2 100644
--- a/decidim-core/app/views/decidim/shared/_filters.html.erb
+++ b/decidim-core/app/views/decidim/shared/_filters.html.erb
@@ -4,7 +4,7 @@
 <% if filter_sections.present? || local_assigns.has_key?(:search_variable) %>
   <%= redesigned_filter_form_for filter, url_for, class: "new_filter self-stretch", data: { filters: "", component: "accordion" } do |form| %>
 
-    <button id="dropdown-trigger" data-component="dropdown" data-target="dropdown-menu-filters">
+    <button id="dropdown-trigger" data-component="dropdown" data-target="dropdown-menu-filters" data-disabled-md="true">
       <%= icon "arrow-down-s-line" %>
       <%= icon "arrow-up-s-line" %>
       <span>
diff --git a/decidim-core/app/views/layouts/decidim/shared/_layout_user_profile.html.erb b/decidim-core/app/views/layouts/decidim/shared/_layout_user_profile.html.erb
index c4df709193e08..cf1325d7632e7 100644
--- a/decidim-core/app/views/layouts/decidim/shared/_layout_user_profile.html.erb
+++ b/decidim-core/app/views/layouts/decidim/shared/_layout_user_profile.html.erb
@@ -10,7 +10,7 @@
 
   <div class="vertical-tabs">
     <nav aria-label="menu-vertical">
-      <button id="dropdown-trigger" data-component="dropdown" data-target="dropdown-menu" data-auto-close="true">
+      <button id="dropdown-trigger" data-component="dropdown" data-target="dropdown-menu" data-disabled-md="true">
         <span><%= user_menu.active_item&.label || t("decidim.searches.filters.jump_to") %></span>
         <%= icon "arrow-down-s-line" %>
         <%= icon "arrow-up-s-line" %>

From 0386602bb7a284ba30251893d5015635594438ad Mon Sep 17 00:00:00 2001
From: Hugoren Martinako <aumpfbahn@gmail.com>
Date: Thu, 27 Jul 2023 10:03:38 +0200
Subject: [PATCH 03/14] overwrite status colors for labels (#11380)

---
 .../stylesheets/decidim/_redesigned_labels.scss   | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/decidim-core/app/packs/stylesheets/decidim/_redesigned_labels.scss b/decidim-core/app/packs/stylesheets/decidim/_redesigned_labels.scss
index 2e4966ed59ad7..96de1380043ce 100644
--- a/decidim-core/app/packs/stylesheets/decidim/_redesigned_labels.scss
+++ b/decidim-core/app/packs/stylesheets/decidim/_redesigned_labels.scss
@@ -1,16 +1,23 @@
 .label {
-  @apply bg-gray-2/20 text-gray-2 rounded inline-flex items-center gap-1 px-2 font-semibold text-sm;
+  --success: #16592e;
+  --bg-success: #c4ecd0;
+  --alert: #b9081b;
+  --bg-alert: #ffdee3;
+  --warning: #ad4910;
+  --bg-warning: #ffeebd;
+
+  @apply bg-background text-gray-2 rounded inline-flex items-center gap-1 px-2 font-semibold text-sm;
 
   &.success {
-    @apply bg-success/20 text-success;
+    @apply bg-[var(--bg-success)] text-[var(--success)];
   }
 
   &.alert {
-    @apply bg-alert/20 text-alert;
+    @apply bg-[var(--bg-alert)] text-[var(--alert)];
   }
 
   &.warning {
-    @apply bg-warning/20 text-warning;
+    @apply bg-[var(--bg-warning)] text-[var(--warning)];
   }
 
   &.reverse {

From c290ea8867e6745d4d351edb1435daa9ed3fd249 Mon Sep 17 00:00:00 2001
From: Alexandru Emil Lupu <contact@alecslupu.ro>
Date: Thu, 27 Jul 2023 13:08:24 +0300
Subject: [PATCH 04/14] Refactor dispatched events in participatory space user
 roles (#11338)

---
 .../admin/participatory_space/destroy_admin.rb      | 13 +++++++++----
 .../decidim/admin/test/destroy_admin_examples.rb    | 13 +++++--------
 decidim-proposals/lib/decidim/proposals/engine.rb   |  2 +-
 .../spec/lib/decidim/proposals/engine_spec.rb       |  6 +++---
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/decidim-admin/app/commands/decidim/admin/participatory_space/destroy_admin.rb b/decidim-admin/app/commands/decidim/admin/participatory_space/destroy_admin.rb
index 2a757493bbc51..1b4a27beeb2e2 100644
--- a/decidim-admin/app/commands/decidim/admin/participatory_space/destroy_admin.rb
+++ b/decidim-admin/app/commands/decidim/admin/participatory_space/destroy_admin.rb
@@ -20,8 +20,10 @@ def initialize(role, current_user)
         #
         # Returns nothing.
         def call
-          destroy_role!
-          dispatch_system_event
+          with_events do
+            destroy_role!
+          end
+
           broadcast(:ok)
         end
 
@@ -29,8 +31,11 @@ def call
 
         attr_reader :role, :current_user
 
-        def dispatch_system_event
-          ActiveSupport::Notifications.publish("decidim.system.participatory_space.admin.destroyed", role.class.name, role.id)
+        def event_arguments
+          {
+            class_name: role.class.name,
+            role: role.id
+          }
         end
 
         def destroy_role!
diff --git a/decidim-admin/lib/decidim/admin/test/destroy_admin_examples.rb b/decidim-admin/lib/decidim/admin/test/destroy_admin_examples.rb
index 4e89d69729f16..6e3d75b8d6c07 100644
--- a/decidim-admin/lib/decidim/admin/test/destroy_admin_examples.rb
+++ b/decidim-admin/lib/decidim/admin/test/destroy_admin_examples.rb
@@ -30,13 +30,10 @@
     expect(action_log.version.event).to eq "destroy"
   end
 
-  it "fires an event" do
-    expect(ActiveSupport::Notifications).to receive(:publish).with(
-      "decidim.system.participatory_space.admin.destroyed",
-      role.class.name,
-      role.id
-    )
-
-    subject.call
+  it_behaves_like "fires an ActiveSupport::Notification event", "decidim.admin.participatory_space.destroy_admin:before" do
+    let(:command) { subject }
+  end
+  it_behaves_like "fires an ActiveSupport::Notification event", "decidim.admin.participatory_space.destroy_admin:after" do
+    let(:command) { subject }
   end
 end
diff --git a/decidim-proposals/lib/decidim/proposals/engine.rb b/decidim-proposals/lib/decidim/proposals/engine.rb
index d9214542e766b..4b7307b673e3c 100644
--- a/decidim-proposals/lib/decidim/proposals/engine.rb
+++ b/decidim-proposals/lib/decidim/proposals/engine.rb
@@ -90,7 +90,7 @@ class Engine < ::Rails::Engine
       end
 
       initializer "decidim_proposals.remove_space_admins" do
-        ActiveSupport::Notifications.subscribe("decidim.system.participatory_space.admin.destroyed") do |_event_name, klass, id|
+        ActiveSupport::Notifications.subscribe("decidim.admin.participatorty_space.destroy_admin:after") do |_event_name, klass, id|
           Decidim::Proposals::ValuationAssignment.where(valuator_role_type: klass, valuator_role_id: id).destroy_all
         end
       end
diff --git a/decidim-proposals/spec/lib/decidim/proposals/engine_spec.rb b/decidim-proposals/spec/lib/decidim/proposals/engine_spec.rb
index 5a385d872c231..b9524e4a204e9 100644
--- a/decidim-proposals/spec/lib/decidim/proposals/engine_spec.rb
+++ b/decidim-proposals/spec/lib/decidim/proposals/engine_spec.rb
@@ -17,7 +17,7 @@
 
       it "removes the record" do
         expect do
-          ActiveSupport::Notifications.publish("decidim.system.participatory_space.admin.destroyed", valuator_role.class.name, valuator_role.id)
+          ActiveSupport::Notifications.publish("decidim.admin.participatorty_space.destroy_admin:after", valuator_role.class.name, valuator_role.id)
         end.to change(Decidim::Proposals::ValuationAssignment, :count).by(-1)
       end
     end
@@ -29,7 +29,7 @@
 
       it "removes the record" do
         expect do
-          ActiveSupport::Notifications.publish("decidim.system.participatory_space.admin.destroyed", valuator_role.class.name, valuator_role.id)
+          ActiveSupport::Notifications.publish("decidim.admin.participatorty_space.destroy_admin:after", valuator_role.class.name, valuator_role.id)
         end.to change(Decidim::Proposals::ValuationAssignment, :count).by(-1)
       end
     end
@@ -41,7 +41,7 @@
 
       it "removes the record" do
         expect do
-          ActiveSupport::Notifications.publish("decidim.system.participatory_space.admin.destroyed", valuator_role.class.name, valuator_role.id)
+          ActiveSupport::Notifications.publish("decidim.admin.participatorty_space.destroy_admin:after", valuator_role.class.name, valuator_role.id)
         end.to change(Decidim::Proposals::ValuationAssignment, :count).by(-1)
       end
     end

From d8b006a2c0b62764129f55fcb4d2551646fa6cb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eduardo=20Mart=C3=ADnez?= <eduardomech@gmail.com>
Date: Fri, 28 Jul 2023 08:05:13 +0200
Subject: [PATCH 05/14] Redesign: rename layouts (#11126)

* Replace redesign layouts and views and disable redesign concerns in front

* Recover legacy confirm and timeout modals for admin and system

* Fix legacy upload modal

* Change translation

* Ensure accessibility

* Remove redesign helper for modals

* Fix selector in test

* Adapt action authorization helper to redesign

* Update selectors in test

* Reorder initiatives layout and partials

* Fix upload modal in front

* Include DisabledRedesignLayout to fix upload modal in system controller

* Deprecate use of authorization_modals content partial in favor of cell

* Fix participatory spaces layout issues

* Fix before_action order

* Fix accessibility of pages show

* Fix initiative show layout

* remove participatory_space_wrapper

* Fix selector in test

* Adapt test

* Refactor dummy_resources show to use correct social share button

* Adapt test to redesign

* Move translation bar to application layout

* Adapt icon tests to redesigned icons

* Redesign initiative signature views

* Display floating help in initiatives index

* Recover before_action filter introduced by participatory_space_layout for initiative show action

* Remove unused translations

* Revert use of redesigned_participatory_space_layout in elections and votings controller

* Rename redesigned layout on elections

* Update decidim-core/app/views/layouts/decidim/_decidim_javascript.html.erb

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>

* Remove unused partial

* Move specific admin templates and partials from core to admin module

* Update decidim-core/app/views/layouts/decidim/_decidim_javascript.html.erb

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>

* Remove participatory_space_layout from elections component

* Update decidim-core/app/helpers/decidim/action_authorization_helper.rb

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>

* Update decidim-core/app/helpers/decidim/action_authorization_helper.rb

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>

* Update decidim-core/app/helpers/decidim/layout_helper.rb

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>

* Revert redesign condition changes

---------

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>
---
 config/i18n-tasks.yml                         |   1 +
 .../accountability/application_controller.rb  |   1 -
 .../shared/_admin_confirm_modal.html.erb      |  18 +++
 .../admin/_admin_timeout_modal.html.erb       |  24 ++++
 .../decidim/admin/_application.html.erb       |   4 +-
 ...manages_static_page_content_blocks_spec.rb |   2 +-
 .../assemblies/application_controller.rb      |   3 -
 .../assemblies/assemblies_controller.rb       |   2 +-
 .../assemblies/assembly_members_controller.rb |   2 +-
 .../views/layouts/decidim/assembly.html.erb   |  18 +--
 .../decidim/redesigned_assembly.html.erb      |  19 ---
 .../decidim/blogs/application_controller.rb   |   2 -
 .../decidim/blogs/posts_controller.rb         |   2 -
 .../decidim/budgets/application_controller.rb |   1 -
 .../projects/_redesigned_exit_modal.html.erb  |  19 ---
 .../decidim/budgets/projects/show.html.erb    |   6 +-
 .../decidim/budgets/projects_helper_spec.rb   |   8 --
 .../registration_type/join_conference.erb     |   2 +-
 .../conferences/registration_type_cell.rb     |   1 -
 .../conferences/application_controller.rb     |   2 -
 .../conference_program_controller.rb          |   2 +-
 .../conference_speakers_controller.rb         |   2 +-
 .../conferences/conferences_controller.rb     |   2 +-
 .../decidim/conferences/media_controller.rb   |   2 +-
 .../registration_types_controller.rb          |   2 +-
 .../views/layouts/decidim/conference.html.erb |  20 +--
 .../decidim/conferences/application.html.erb  |   3 +
 .../redesigned_application.html.erb           |   6 -
 .../decidim/redesigned_conference.html.erb    |  17 ---
 .../app/cells/decidim/upload_modal/show.erb   |   2 +-
 .../app/cells/decidim/upload_modal_cell.rb    |   5 +-
 .../concerns/decidim/devise_controllers.rb    |   3 -
 .../concerns/decidim/user_profile.rb          |   1 -
 .../decidim/application_controller.rb         |   3 -
 .../decidim/components/base_controller.rb     |   2 +-
 .../messaging/conversations_controller.rb     |   6 +-
 .../decidim/profiles_controller.rb            |   2 -
 .../decidim/user_activities_controller.rb     |   2 -
 .../decidim/action_authorization_helper.rb    |  14 +-
 .../app/helpers/decidim/application_helper.rb |   1 -
 .../helpers/decidim/contextual_help_helper.rb |   4 -
 .../app/helpers/decidim/endorsable_helper.rb  |   6 +-
 .../app/helpers/decidim/layout_helper.rb      |   2 +-
 .../decidim/participatory_space_helpers.rb    |   8 +-
 .../app/helpers/decidim/redesign_helper.rb    |  25 ----
 .../decidim/social_share_button_helper.rb     |  10 +-
 .../authorization_modals/_content.html.erb    |  49 -------
 .../_redesigned_content.html.erb              |  49 -------
 .../authorization_modals/show.html.erb        |   6 +-
 .../decidim/devise/confirmations/new.html.erb |   2 +-
 .../decidim/devise/passwords/edit.html.erb    |   2 +-
 .../decidim/devise/passwords/new.html.erb     |   2 +-
 .../decidim/devise/registrations/new.html.erb |   2 +-
 .../decidim/devise/sessions/new.html.erb      |   2 +-
 .../decidim/devise/shared/_links.html.erb     |  20 +--
 .../devise/shared/_omniauth_buttons.html.erb  |   3 +-
 .../devise/shared/_redesigned_links.html.erb  |  19 ---
 .../views/decidim/devise/unlocks/new.html.erb |   2 +-
 .../update_buttons_and_counters.js.erb        |  70 ++++------
 .../shared/_authorization_modal.html.erb      |   2 +-
 .../decidim/shared/_confirm_modal.html.erb    |  31 +++--
 .../decidim/shared/_floating_help.html.erb    |  40 ++----
 .../decidim/shared/_login_modal.html.erb      |  96 +++++++-------
 .../_redesigned_authorization_modal.html.erb  |   1 -
 .../shared/_redesigned_confirm_modal.html.erb |  17 ---
 .../shared/_redesigned_floating_help.html.erb |  16 ---
 .../shared/_redesigned_login_modal.html.erb   |  53 --------
 .../shared/_redesigned_share_modal.html.erb   |  26 ----
 .../decidim/shared/_share_modal.html.erb      |  65 +++-------
 ...ee.html.erb => _check_boxes_tree.html.erb} |   0
 ...llection.html.erb => _collection.html.erb} |   0
 .../layouts/decidim/_admin_links.html.erb     |  23 ++--
 .../layouts/decidim/_application.html.erb     |   6 +-
 .../decidim/_decidim_javascript.html.erb      |   7 +-
 .../app/views/layouts/decidim/_head.html.erb  |   8 +-
 .../decidim/_js_configuration.html.erb        |   5 +-
 .../decidim/_redesigned_application.html.erb  |  30 -----
 .../_redesigned_decidim_javascript.html.erb   |  15 ---
 .../layouts/decidim/_redesigned_head.html.erb |  39 ------
 .../_redesigned_js_configuration.html.erb     |  39 ------
 .../_redesigned_timeout_modal.html.erb        |  32 -----
 .../decidim/_redesigned_wrapper.html.erb      |  35 -----
 .../_redesinged_decidim_javascript.html.erb   |   2 +-
 .../layouts/decidim/_timeout_modal.html.erb   |  36 ++++--
 .../views/layouts/decidim/_wrapper.html.erb   | 120 +++---------------
 ...edesigned_main.html.erb => _main.html.erb} |  10 +-
 ...in_intro.html.erb => _main_intro.html.erb} |   0
 ...ml.erb => _main_language_chooser.html.erb} |   0
 ...in_legal.html.erb => _main_legal.html.erb} |   0
 ...in_links.html.erb => _main_links.html.erb} |   0
 ....erb => _main_social_media_links.html.erb} |   0
 ...edesigned_mini.html.erb => _mini.html.erb} |   0
 ...edesigned_main.html.erb => _main.html.erb} |  12 +-
 ....html.erb => _main_links_desktop.html.erb} |   2 +-
 ...html.erb => _main_links_dropdown.html.erb} |   0
 ...e.html.erb => _main_links_mobile.html.erb} |   0
 ...rb => _main_links_mobile_account.html.erb} |   2 +-
 ...erb => _main_links_mobile_search.html.erb} |   0
 ..._search.html.erb => _main_search.html.erb} |   0
 ...edesigned_menu.html.erb => _menu.html.erb} |   4 +-
 ....erb => _menu_breadcrumb_desktop.html.erb} |   4 +-
 ...ml.erb => _menu_breadcrumb_items.html.erb} |   0
 ...> _menu_breadcrumb_main_dropdown.html.erb} |   2 +-
 ...readcrumb_main_dropdown_top_left.html.erb} |   0
 ...> _menu_breadcrumb_mobile_tablet.html.erb} |   0
 .../decidim/redesigned_application.html.erb   |   3 -
 .../redesigned_newsletter_base.html.erb       |  46 -------
 .../decidim/redesigned_user_profile.html.erb  |   3 -
 .../decidim/shared/_layout_center.html.erb    |   2 +-
 .../decidim/shared/_layout_two_col.html.erb   |   2 +-
 .../layouts/decidim/user_profile.html.erb     |  35 +----
 decidim-core/config/locales/en.yml            |  10 --
 decidim-core/lib/decidim/form_builder.rb      |   2 +-
 .../decidim/redesigned_filter_form_builder.rb |   2 +-
 decidim-core/lib/decidim/view_model.rb        |   2 -
 .../spec/cells/decidim/activity_cell_spec.rb  |   4 -
 .../cells/decidim/user_activity_cell_spec.rb  |   5 -
 .../action_authorization_helper_spec.rb       |  20 ++-
 .../decidim/check_boxes_tree_helper_spec.rb   |   2 -
 .../decidim/decidim_form_helper_spec.rb       |   8 --
 .../helpers/decidim/endorsable_helper_spec.rb |   5 -
 .../spec/helpers/decidim/icon_helper_spec.rb  |  15 +--
 .../social_share_button_helper_spec.rb        |  11 +-
 decidim-core/spec/lib/form_builder_spec.rb    |  18 ++-
 .../spec/system/data_consent/scripts_spec.rb  |   4 -
 .../spec/system/social_share_button_spec.rb   |  15 +--
 .../system/user_group_manage_admins_spec.rb   |   8 +-
 .../decidim/debates/application_controller.rb |   1 -
 .../dummy_resources_controller.rb             |   2 -
 .../dummy_resources/show.html.erb             |  30 +++--
 .../elections/application_controller.rb       |   1 -
 .../decidim/votings/votings_controller.rb     |   2 +-
 .../decidim/redesigned_votings.html.erb       |  12 --
 .../views/layouts/decidim/votings.html.erb    |  21 ++-
 .../initiatives/application_controller.rb     |   3 -
 .../initiatives/initiatives_controller.rb     |   5 +-
 .../_wizard_steps.html.erb                    |   5 -
 .../fill_personal_data.html.erb               |  64 ++++------
 .../initiative_signatures/finish.html.erb     |  14 +-
 .../initiative_signatures/sms_code.html.erb   |  21 +--
 .../sms_phone_number.html.erb                 |  22 +---
 .../initiatives/initiatives/edit.html.erb     |  10 +-
 .../initiatives/initiatives/index.html.erb    |   9 +-
 .../initiatives/initiatives/show.html.erb     |   8 +-
 .../_initiative_creation_header.html.erb      |   4 +-
 ...tiative_signature_creation_header.html.erb |  17 +--
 .../views/layouts/decidim/initiative.html.erb |   4 +-
 .../decidim/initiative_creation.html.erb      |  23 +---
 ...tive.html.erb => initiative_head.html.erb} |   2 +-
 .../initiative_signature_creation.html.erb    |  14 +-
 .../redesigned_initiative_creation.html.erb   |   9 --
 ...ned_initiative_signature_creation.html.erb |  13 --
 decidim-initiatives/config/locales/en.yml     |   2 -
 ...nitiative_signing_sms_verification_spec.rb |   2 +-
 .../meetings/application_controller.rb        |   2 -
 .../meetings/meeting_closes_controller.rb     |   2 -
 .../decidim/meetings/meetings_controller.rb   |   2 -
 .../meetings/registrations_controller.rb      |   2 -
 .../decidim/meetings/versions_controller.rb   |   2 -
 .../meetings/layouts/live_event.html.erb      |  42 +++---
 .../layouts/redesigned_live_event.html.erb    |  57 ---------
 .../_upcoming_meeting_for_card.html.erb       |   9 +-
 decidim-meetings/config/locales/en.yml        |   2 -
 .../decidim/pages/application_controller.rb   |   2 -
 .../application_controller.rb                 |   3 -
 .../participatory_processes_controller.rb     |   2 +-
 .../decidim/participatory_process.html.erb    |  18 +--
 .../redesigned_participatory_process.html.erb |  19 ---
 .../proposals/application_controller.rb       |   2 -
 .../decidim/proposals/proposals_controller.rb |   2 -
 .../spec/helpers/map_helper_spec.rb           |   8 --
 .../sortitions/application_controller.rb      |   1 -
 .../decidim/sortitions/sortitions_spec.rb     |   4 +-
 .../decidim/surveys/application_controller.rb |   1 -
 .../decidim/surveys/surveys_controller.rb     |   4 +-
 .../helpers/decidim/surveys/survey_helper.rb  |   4 +-
 .../surveys/surveys/no_permission.html.erb    |   2 +-
 .../decidim/system/application_controller.rb  |   1 -
 .../system/oauth_applications_controller.rb   |   2 +
 .../decidim/system/application.html.erb       |   2 +-
 .../authorizations_controller.rb              |   2 -
 .../layouts/decidim/authorizations.html.erb   |   7 +-
 .../redesigned_authorizations.html.erb        |   8 --
 .../authorizations/new.html.erb_spec.rb       |   1 -
 .../app/views/layouts/redesigned.html.erb     |   2 +-
 185 files changed, 499 insertions(+), 1557 deletions(-)
 create mode 100644 decidim-admin/app/views/decidim/admin/shared/_admin_confirm_modal.html.erb
 create mode 100644 decidim-admin/app/views/layouts/decidim/admin/_admin_timeout_modal.html.erb
 delete mode 100644 decidim-assemblies/app/views/layouts/decidim/redesigned_assembly.html.erb
 delete mode 100644 decidim-budgets/app/views/decidim/budgets/projects/_redesigned_exit_modal.html.erb
 delete mode 100644 decidim-conferences/app/views/layouts/decidim/conferences/redesigned_application.html.erb
 delete mode 100644 decidim-conferences/app/views/layouts/decidim/redesigned_conference.html.erb
 delete mode 100644 decidim-core/app/helpers/decidim/redesign_helper.rb
 delete mode 100644 decidim-core/app/views/decidim/authorization_modals/_content.html.erb
 delete mode 100644 decidim-core/app/views/decidim/authorization_modals/_redesigned_content.html.erb
 delete mode 100644 decidim-core/app/views/decidim/devise/shared/_redesigned_links.html.erb
 delete mode 100644 decidim-core/app/views/decidim/shared/_redesigned_authorization_modal.html.erb
 delete mode 100644 decidim-core/app/views/decidim/shared/_redesigned_confirm_modal.html.erb
 delete mode 100644 decidim-core/app/views/decidim/shared/_redesigned_floating_help.html.erb
 delete mode 100644 decidim-core/app/views/decidim/shared/_redesigned_login_modal.html.erb
 delete mode 100644 decidim-core/app/views/decidim/shared/_redesigned_share_modal.html.erb
 rename decidim-core/app/views/decidim/shared/filters/{_redesigned_check_boxes_tree.html.erb => _check_boxes_tree.html.erb} (100%)
 rename decidim-core/app/views/decidim/shared/filters/{_redesigned_collection.html.erb => _collection.html.erb} (100%)
 delete mode 100644 decidim-core/app/views/layouts/decidim/_redesigned_application.html.erb
 delete mode 100644 decidim-core/app/views/layouts/decidim/_redesigned_decidim_javascript.html.erb
 delete mode 100644 decidim-core/app/views/layouts/decidim/_redesigned_head.html.erb
 delete mode 100644 decidim-core/app/views/layouts/decidim/_redesigned_js_configuration.html.erb
 delete mode 100644 decidim-core/app/views/layouts/decidim/_redesigned_timeout_modal.html.erb
 delete mode 100644 decidim-core/app/views/layouts/decidim/_redesigned_wrapper.html.erb
 rename decidim-core/app/views/layouts/decidim/footer/{_redesigned_main.html.erb => _main.html.erb} (59%)
 rename decidim-core/app/views/layouts/decidim/footer/{_redesigned_main_intro.html.erb => _main_intro.html.erb} (100%)
 rename decidim-core/app/views/layouts/decidim/footer/{_redesigned_main_language_chooser.html.erb => _main_language_chooser.html.erb} (100%)
 rename decidim-core/app/views/layouts/decidim/footer/{_redesigned_main_legal.html.erb => _main_legal.html.erb} (100%)
 rename decidim-core/app/views/layouts/decidim/footer/{_redesigned_main_links.html.erb => _main_links.html.erb} (100%)
 rename decidim-core/app/views/layouts/decidim/footer/{_redesigned_main_social_media_links.html.erb => _main_social_media_links.html.erb} (100%)
 rename decidim-core/app/views/layouts/decidim/footer/{_redesigned_mini.html.erb => _mini.html.erb} (100%)
 rename decidim-core/app/views/layouts/decidim/header/{_redesigned_main.html.erb => _main.html.erb} (61%)
 rename decidim-core/app/views/layouts/decidim/header/{_redesigned_main_links_desktop.html.erb => _main_links_desktop.html.erb} (95%)
 rename decidim-core/app/views/layouts/decidim/header/{_redesigned_main_links_dropdown.html.erb => _main_links_dropdown.html.erb} (100%)
 rename decidim-core/app/views/layouts/decidim/header/{_redesigned_main_links_mobile.html.erb => _main_links_mobile.html.erb} (100%)
 rename decidim-core/app/views/layouts/decidim/header/{_redesigned_main_links_mobile_account.html.erb => _main_links_mobile_account.html.erb} (92%)
 rename decidim-core/app/views/layouts/decidim/header/{_redesigned_main_links_mobile_search.html.erb => _main_links_mobile_search.html.erb} (100%)
 rename decidim-core/app/views/layouts/decidim/header/{_redesigned_main_search.html.erb => _main_search.html.erb} (100%)
 rename decidim-core/app/views/layouts/decidim/header/{_redesigned_menu.html.erb => _menu.html.erb} (71%)
 rename decidim-core/app/views/layouts/decidim/header/{_redesigned_menu_breadcrumb_desktop.html.erb => _menu_breadcrumb_desktop.html.erb} (74%)
 rename decidim-core/app/views/layouts/decidim/header/{_redesigned_menu_breadcrumb_items.html.erb => _menu_breadcrumb_items.html.erb} (100%)
 rename decidim-core/app/views/layouts/decidim/header/{_redesigned_menu_breadcrumb_main_dropdown.html.erb => _menu_breadcrumb_main_dropdown.html.erb} (85%)
 rename decidim-core/app/views/layouts/decidim/header/{_redesigned_menu_breadcrumb_main_dropdown_top_left.html.erb => _menu_breadcrumb_main_dropdown_top_left.html.erb} (100%)
 rename decidim-core/app/views/layouts/decidim/header/{_redesigned_menu_breadcrumb_mobile_tablet.html.erb => _menu_breadcrumb_mobile_tablet.html.erb} (100%)
 delete mode 100644 decidim-core/app/views/layouts/decidim/redesigned_application.html.erb
 delete mode 100644 decidim-core/app/views/layouts/decidim/redesigned_newsletter_base.html.erb
 delete mode 100644 decidim-core/app/views/layouts/decidim/redesigned_user_profile.html.erb
 delete mode 100644 decidim-elections/app/views/layouts/decidim/redesigned_votings.html.erb
 rename decidim-initiatives/app/views/layouts/decidim/{redesigned_initiative.html.erb => initiative_head.html.erb} (89%)
 delete mode 100644 decidim-initiatives/app/views/layouts/decidim/redesigned_initiative_creation.html.erb
 delete mode 100644 decidim-initiatives/app/views/layouts/decidim/redesigned_initiative_signature_creation.html.erb
 delete mode 100644 decidim-meetings/app/views/decidim/meetings/layouts/redesigned_live_event.html.erb
 delete mode 100644 decidim-participatory_processes/app/views/layouts/decidim/redesigned_participatory_process.html.erb
 delete mode 100644 decidim-verifications/app/views/layouts/decidim/redesigned_authorizations.html.erb

diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index 8469fc576deb0..f8471271560d3 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -369,6 +369,7 @@ ignore_unused:
   - versions.dropdown.option_*
   - decidim.meetings.meetings.filters.*
   - decidim.meetings.directory.meetings.index.space_type
+  - decidim.authorization_modals.content.*
 
 ## Exclude these keys from the `i18n-tasks eq-base' report:
 # ignore_eq_base:
diff --git a/decidim-accountability/app/controllers/decidim/accountability/application_controller.rb b/decidim-accountability/app/controllers/decidim/accountability/application_controller.rb
index efdb251e8ab8e..472b7d2efea8f 100644
--- a/decidim-accountability/app/controllers/decidim/accountability/application_controller.rb
+++ b/decidim-accountability/app/controllers/decidim/accountability/application_controller.rb
@@ -8,7 +8,6 @@ module Accountability
     # Note that it inherits from `Decidim::Components::BaseController`, which
     # override its layout and provide all kinds of useful methods.
     class ApplicationController < Decidim::Components::BaseController
-      redesign_participatory_space_layout
     end
   end
 end
diff --git a/decidim-admin/app/views/decidim/admin/shared/_admin_confirm_modal.html.erb b/decidim-admin/app/views/decidim/admin/shared/_admin_confirm_modal.html.erb
new file mode 100644
index 0000000000000..bc4bc713c8bba
--- /dev/null
+++ b/decidim-admin/app/views/decidim/admin/shared/_admin_confirm_modal.html.erb
@@ -0,0 +1,18 @@
+<div class="small reveal confirm-reveal" id="confirm-modal" aria-hidden="true" role="dialog" aria-labelledby="confirm-modal-title" data-reveal data-multiple-opened="true">
+  <div class="reveal__header">
+    <h2 class="reveal__title" id="confirm-modal-title"><%= t("title", scope: "decidim.shared.confirm_modal") %></h2>
+    <button class="close-button" data-close aria-label="<%= t("close_modal", scope: "decidim.shared.confirm_modal") %>"
+      type="button">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+  <div class="confirm-content">
+    <div class="confirm-modal-content"></div>
+  </div>
+  <div class="confirm-modal-footer reveal__footer">
+    <div class="buttons button--double">
+      <a class="button" role="button" href="#" data-confirm-ok aria-label="<%= t("ok", scope: "decidim.shared.confirm_modal") %>"><%= t("ok", scope: "decidim.shared.confirm_modal") %></a>
+      <a class="button clear" role="button" href="#" data-confirm-cancel aria-label="<%= t("cancel", scope: "decidim.shared.confirm_modal") %>"><%= t("cancel", scope: "decidim.shared.confirm_modal") %></a>
+    </div>
+  </div>
+</div>
diff --git a/decidim-admin/app/views/layouts/decidim/admin/_admin_timeout_modal.html.erb b/decidim-admin/app/views/layouts/decidim/admin/_admin_timeout_modal.html.erb
new file mode 100644
index 0000000000000..250c60f503dcb
--- /dev/null
+++ b/decidim-admin/app/views/layouts/decidim/admin/_admin_timeout_modal.html.erb
@@ -0,0 +1,24 @@
+<% if current_user && !current_user.remember_created_at %>
+  <% timeout_time_seconds = Decidim.config.expire_session_after.to_i %>
+  <% prevent_timeout_for = try(:prevent_timeout_seconds) || 0 %>
+  <div class="reveal" id="timeoutModal" data-close-on-click="false" data-close-on-esc="false"
+    data-seconds-until-timeout-path="<%= decidim.seconds_until_timeout_path %>"
+    data-heartbeat-path="<%= decidim.heartbeat_path %>"
+    data-session-timeout="<%= timeout_time_seconds %>"
+    data-prevent-timeout-seconds="<%= prevent_timeout_for %>"
+    data-session-timeout-interval="<%= Decidim.config.session_timeout_interval.to_i * 1000 %>" data-reveal>
+    <h2><%= t("title", scope: "layouts.decidim.timeout_modal") %></h2>
+    <p><%= t("body", scope: "layouts.decidim.timeout_modal", minutes: (timeout_time_seconds / 60) - 2) %></p>
+
+    <div class="reveal__buttons">
+      <%= link_to t("sign_out", scope: "layouts.decidim.timeout_modal"), decidim.destroy_user_session_path, method: :delete, class: "button warning" %>
+      <%= link_to "", decidim.destroy_user_session_path(translation_suffix: :timed_out), method: :delete, id: "reveal-hidden-sign-out", class: "hide" %>
+      <%= button_to t("continue_session", scope: "layouts.decidim.timeout_modal"),
+        decidim.heartbeat_path,
+        id: "continueSession",
+        class: "button primary",
+        remote: true,
+        method: :post %>
+    </div>
+  </div>
+<% end %>
diff --git a/decidim-admin/app/views/layouts/decidim/admin/_application.html.erb b/decidim-admin/app/views/layouts/decidim/admin/_application.html.erb
index 026ede429911b..bf8ea44e9ebcf 100644
--- a/decidim-admin/app/views/layouts/decidim/admin/_application.html.erb
+++ b/decidim-admin/app/views/layouts/decidim/admin/_application.html.erb
@@ -13,7 +13,7 @@
     <%= render partial: "layouts/decidim/admin/header" %>
   </head>
   <body>
-    <%= render partial: "layouts/decidim/timeout_modal" %>
+    <%= render partial: "layouts/decidim/admin/admin_timeout_modal" %>
     <%= render partial: "layouts/decidim/admin/template_top" %>
     <div class="layout-nav">
       <%= main_menu.render %>
@@ -26,7 +26,7 @@
       </div>
     </div>
     <%= render partial: "layouts/decidim/admin/template_bottom" %>
-    <%= render partial: "decidim/shared/confirm_modal" %>
+    <%= render partial: "decidim/admin/shared/admin_confirm_modal" %>
     <%= render partial: "layouts/decidim/admin/js_configuration" %>
     <%= render partial: "layouts/decidim/cors" if Decidim.cors_enabled %>
 
diff --git a/decidim-admin/spec/system/admin_manages_static_page_content_blocks_spec.rb b/decidim-admin/spec/system/admin_manages_static_page_content_blocks_spec.rb
index c046975cf9076..7082695e1fa2b 100644
--- a/decidim-admin/spec/system/admin_manages_static_page_content_blocks_spec.rb
+++ b/decidim-admin/spec/system/admin_manages_static_page_content_blocks_spec.rb
@@ -69,7 +69,7 @@
 
       within ".edit_content_blocks" do
         within first("ul.js-list-actives li") do
-          find(".icon--x").click
+          find("a[data-method='delete']").click
         end
       end
 
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/application_controller.rb b/decidim-assemblies/app/controllers/decidim/assemblies/application_controller.rb
index 37eb8ef1c111b..8211dad87d763 100644
--- a/decidim-assemblies/app/controllers/decidim/assemblies/application_controller.rb
+++ b/decidim-assemblies/app/controllers/decidim/assemblies/application_controller.rb
@@ -8,9 +8,6 @@ class ApplicationController < Decidim::ApplicationController
       helper Decidim::Assemblies::AssembliesHelper
       include NeedsPermission
 
-      include RedesignLayout
-      redesign active: true
-
       register_permissions(Decidim::Assemblies::ApplicationController,
                            ::Decidim::Assemblies::Permissions,
                            ::Decidim::Admin::Permissions,
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/assemblies_controller.rb b/decidim-assemblies/app/controllers/decidim/assemblies/assemblies_controller.rb
index 75af76c8a80b8..37db708bce37d 100644
--- a/decidim-assemblies/app/controllers/decidim/assemblies/assemblies_controller.rb
+++ b/decidim-assemblies/app/controllers/decidim/assemblies/assemblies_controller.rb
@@ -7,7 +7,7 @@ class AssembliesController < Decidim::Assemblies::ApplicationController
       include ParticipatorySpaceContext
       include AssemblyBreadcrumb
 
-      redesign_participatory_space_layout only: :show
+      participatory_space_layout only: :show
 
       include FilterResource
       include Paginable
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/assembly_members_controller.rb b/decidim-assemblies/app/controllers/decidim/assemblies/assembly_members_controller.rb
index 8c8c728d50822..7b66cccc87c5e 100644
--- a/decidim-assemblies/app/controllers/decidim/assemblies/assembly_members_controller.rb
+++ b/decidim-assemblies/app/controllers/decidim/assemblies/assembly_members_controller.rb
@@ -6,7 +6,7 @@ class AssemblyMembersController < Decidim::Assemblies::ApplicationController
       include ParticipatorySpaceContext
       include AssemblyBreadcrumb
 
-      redesign_participatory_space_layout only: :index
+      participatory_space_layout only: :index
 
       helper_method :collection
 
diff --git a/decidim-assemblies/app/views/layouts/decidim/assembly.html.erb b/decidim-assemblies/app/views/layouts/decidim/assembly.html.erb
index 37783db6b23ae..0be9bf01187f3 100644
--- a/decidim-assemblies/app/views/layouts/decidim/assembly.html.erb
+++ b/decidim-assemblies/app/views/layouts/decidim/assembly.html.erb
@@ -5,21 +5,13 @@
   description: translated_attribute(current_participatory_space.short_description)
 ) %>
 
+<%= append_javascript_pack_tag "decidim_assemblies" %>
+<%= append_stylesheet_pack_tag "decidim_assemblies", media: "all" %>
+
 <%= render "layouts/decidim/application" do %>
-  <%= render partial: "layouts/decidim/assembly_header" %>
-  <%= cell "decidim/translation_bar", current_organization %>
-  <div class="wrapper">
+  <main>
     <%= yield %>
-  </div>
-  <% if content_for? :expanded %>
-    <div class="expanded">
-      <div class="wrapper wrapper--inner">
-        <div class="row">
-          <%= yield :expanded %>
-        </div>
-      </div>
-    </div>
-  <% end %>
+  </main>
 <% end %>
 
 <% provide :meta_image_url, current_participatory_space.attached_uploader(:banner_image).path %>
diff --git a/decidim-assemblies/app/views/layouts/decidim/redesigned_assembly.html.erb b/decidim-assemblies/app/views/layouts/decidim/redesigned_assembly.html.erb
deleted file mode 100644
index 0425dc2772619..0000000000000
--- a/decidim-assemblies/app/views/layouts/decidim/redesigned_assembly.html.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<% add_decidim_page_title(translated_attribute(current_component.name)) if try(:current_component) %>
-<% add_decidim_page_title(translated_attribute(current_participatory_space.title)) %>
-<% add_decidim_meta_tags(
-  image_url: current_participatory_space.attached_uploader(:banner_image).path,
-  description: translated_attribute(current_participatory_space.short_description)
-) %>
-
-<%= append_javascript_pack_tag "decidim_assemblies" %>
-<%= append_stylesheet_pack_tag "decidim_assemblies", media: "all" %>
-
-<%= render "layouts/decidim/redesigned_application" do %>
-  <%= cell "decidim/translation_bar", current_organization %>
-
-  <main>
-    <%= yield %>
-  </main>
-<% end %>
-
-<% provide :meta_image_url, current_participatory_space.attached_uploader(:banner_image).path %>
diff --git a/decidim-blogs/app/controllers/decidim/blogs/application_controller.rb b/decidim-blogs/app/controllers/decidim/blogs/application_controller.rb
index cc4ea1f1b7fa1..b163c6b521d3f 100644
--- a/decidim-blogs/app/controllers/decidim/blogs/application_controller.rb
+++ b/decidim-blogs/app/controllers/decidim/blogs/application_controller.rb
@@ -9,8 +9,6 @@ module Blogs
     # override its layout and provide all kinds of useful methods.
     class ApplicationController < Decidim::Components::BaseController
       helper Decidim::Blogs::ApplicationHelper
-
-      redesign_participatory_space_layout
     end
   end
 end
diff --git a/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb b/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb
index 0620230918f15..4cbf96e7d485b 100644
--- a/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb
+++ b/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb
@@ -8,8 +8,6 @@ class PostsController < Decidim::Blogs::ApplicationController
       include Paginable
       include Decidim::IconHelper
 
-      redesign active: true
-
       helper_method :posts, :post, :post_presenter, :paginate_posts, :posts_most_commented, :tabs, :panels
 
       def index; end
diff --git a/decidim-budgets/app/controllers/decidim/budgets/application_controller.rb b/decidim-budgets/app/controllers/decidim/budgets/application_controller.rb
index 49c138643682c..2b98bd9101101 100644
--- a/decidim-budgets/app/controllers/decidim/budgets/application_controller.rb
+++ b/decidim-budgets/app/controllers/decidim/budgets/application_controller.rb
@@ -8,7 +8,6 @@ module Budgets
     # Note that it inherits from `Decidim::Components::BaseController`, which
     # override its layout and provide all kinds of useful methods.
     class ApplicationController < Decidim::Components::BaseController
-      redesign_participatory_space_layout
       helper_method :current_workflow, :voting_finished?, :voting_open?
 
       def current_workflow
diff --git a/decidim-budgets/app/views/decidim/budgets/projects/_redesigned_exit_modal.html.erb b/decidim-budgets/app/views/decidim/budgets/projects/_redesigned_exit_modal.html.erb
deleted file mode 100644
index 1de26908cbf98..0000000000000
--- a/decidim-budgets/app/views/decidim/budgets/projects/_redesigned_exit_modal.html.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<% if current_user && current_component.current_settings.votes == "enabled" && !current_workflow.voted?(budget) %>
-  <%= decidim_modal id: "exit-notification" do %>
-    <div data-dialog-container>
-      <%= icon "information-line" %>
-      <h3 class="h3" id="dialog-title-exit-notification" tabindex="-1" data-dialog-title>
-        <%= t("title", scope: "decidim.budgets.projects.exit_modal") %>
-      </h3>
-      <p id="dialog-desc-budget-modal">
-        <%= t("message", scope: "decidim.budgets.projects.exit_modal") %>
-      </p>
-    </div>
-    <div data-dialog-actions>
-      <button data-dialog-close="exit-notification" class="button button__sm md:button__lg button__secondary">
-        <p><%= t("cancel", scope: "decidim.budgets.projects.exit_modal") %></p>
-      </button>
-      <%= link_to t("exit", scope: "decidim.budgets.projects.exit_modal"), budget_projects_path, id: "exit-notification-link", class: "button button__sm md:button__lg button__secondary" %>
-    </div>
-  <% end %>
-<% end %>
diff --git a/decidim-budgets/app/views/decidim/budgets/projects/show.html.erb b/decidim-budgets/app/views/decidim/budgets/projects/show.html.erb
index 540ef520514e2..3493ee837813e 100644
--- a/decidim-budgets/app/views/decidim/budgets/projects/show.html.erb
+++ b/decidim-budgets/app/views/decidim/budgets/projects/show.html.erb
@@ -15,11 +15,7 @@ edit_link(
 <%= append_javascript_pack_tag "decidim_budgets" %>
 <%= append_stylesheet_pack_tag "decidim_budgets" %>
 
-<% if redesign_enabled? %>
-  <%= render partial: "redesigned_exit_modal" %>
-<% else %>
-  <%= render partial: "exit_modal" %>
-<% end %>
+<%= render partial: "exit_modal" %>
 
 <div id="project-item">
   <%= render partial: "budget_summary", locals: { include_heading: true, project_item: true, responsive: true } %>
diff --git a/decidim-budgets/spec/helpers/decidim/budgets/projects_helper_spec.rb b/decidim-budgets/spec/helpers/decidim/budgets/projects_helper_spec.rb
index d189ddd0cd2e0..bf4700f32cc4c 100644
--- a/decidim-budgets/spec/helpers/decidim/budgets/projects_helper_spec.rb
+++ b/decidim-budgets/spec/helpers/decidim/budgets/projects_helper_spec.rb
@@ -19,14 +19,6 @@ module Budgets
       let(:longitude) { 2.1234 }
       let(:redesign_enabled) { false }
 
-      before do
-        # rubocop:disable RSpec/AnyInstance
-        allow_any_instance_of(ActionView::Base).to receive(:redesign_enabled?).and_return(redesign_enabled)
-        allow_any_instance_of(ActionView::Base).to receive(:redesigned_layout).and_return("decidim/budgets/project_metadata")
-        allow_any_instance_of(Decidim::Budgets::ProjectMetadataCell).to receive(:redesign_enabled?).and_return(redesign_enabled)
-        # rubocop:enable RSpec/AnyInstance
-      end
-
       describe "#has_position?" do
         subject { helper.has_position?(project) }
 
diff --git a/decidim-conferences/app/cells/decidim/conferences/registration_type/join_conference.erb b/decidim-conferences/app/cells/decidim/conferences/registration_type/join_conference.erb
index 84b12476fbdba..ba9b41aff406d 100644
--- a/decidim-conferences/app/cells/decidim/conferences/registration_type/join_conference.erb
+++ b/decidim-conferences/app/cells/decidim/conferences/registration_type/join_conference.erb
@@ -15,7 +15,7 @@
           type: "button",
           class: "#{button_classes} conference__registration-button",
           disabled: !conference.has_available_slots? || conference.has_registration_for?(current_user),
-          data: { modal_open_key => current_user.present? ? "conference-registration-confirm-#{model.id}" : "loginModal" }
+          data: { dialog_open: current_user.present? ? "conference-registration-confirm-#{model.id}" : "loginModal" }
         ) do %>
         <span><%= i18n_join_text %></span>
         <%= icon "ticket-line", class: "w-3.5 h-3.5 fill-current flex-none" %>
diff --git a/decidim-conferences/app/cells/decidim/conferences/registration_type_cell.rb b/decidim-conferences/app/cells/decidim/conferences/registration_type_cell.rb
index d393fff482d14..9e01327ae28ca 100644
--- a/decidim-conferences/app/cells/decidim/conferences/registration_type_cell.rb
+++ b/decidim-conferences/app/cells/decidim/conferences/registration_type_cell.rb
@@ -8,7 +8,6 @@ class RegistrationTypeCell < Decidim::ViewModel
       include Decidim::SanitizeHelper
       include Decidim::Conferences::Engine.routes.url_helpers
       include Decidim::LayoutHelper
-      include Decidim::RedesignHelper
 
       def show
         render
diff --git a/decidim-conferences/app/controllers/decidim/conferences/application_controller.rb b/decidim-conferences/app/controllers/decidim/conferences/application_controller.rb
index 2bc7e99d990c7..8c18308df75c8 100644
--- a/decidim-conferences/app/controllers/decidim/conferences/application_controller.rb
+++ b/decidim-conferences/app/controllers/decidim/conferences/application_controller.rb
@@ -9,8 +9,6 @@ class ApplicationController < Decidim::ApplicationController
       helper Decidim::Conferences::ConferenceHelper
 
       include NeedsPermission
-      include RedesignLayout
-      redesign active: true
 
       layout "layouts/decidim/conferences/application"
 
diff --git a/decidim-conferences/app/controllers/decidim/conferences/conference_program_controller.rb b/decidim-conferences/app/controllers/decidim/conferences/conference_program_controller.rb
index 57b2a8393e752..8b4ebc46914c5 100644
--- a/decidim-conferences/app/controllers/decidim/conferences/conference_program_controller.rb
+++ b/decidim-conferences/app/controllers/decidim/conferences/conference_program_controller.rb
@@ -6,7 +6,7 @@ class ConferenceProgramController < Decidim::Conferences::ApplicationController
       include ParticipatorySpaceContext
       helper Decidim::SanitizeHelper
       helper Decidim::Conferences::ConferenceProgramHelper
-      redesign_participatory_space_layout only: :show
+      participatory_space_layout only: :show
 
       helper_method :collection, :conference, :meeting_days, :meeting_component
 
diff --git a/decidim-conferences/app/controllers/decidim/conferences/conference_speakers_controller.rb b/decidim-conferences/app/controllers/decidim/conferences/conference_speakers_controller.rb
index 9efa852aaaeb8..aec51c1e365d4 100644
--- a/decidim-conferences/app/controllers/decidim/conferences/conference_speakers_controller.rb
+++ b/decidim-conferences/app/controllers/decidim/conferences/conference_speakers_controller.rb
@@ -5,7 +5,7 @@ module Conferences
     class ConferenceSpeakersController < Decidim::Conferences::ApplicationController
       include ParticipatorySpaceContext
 
-      redesign_participatory_space_layout only: :index
+      participatory_space_layout only: :index
 
       helper_method :collection, :conference
 
diff --git a/decidim-conferences/app/controllers/decidim/conferences/conferences_controller.rb b/decidim-conferences/app/controllers/decidim/conferences/conferences_controller.rb
index de32d2ac13032..8b2d0111327aa 100644
--- a/decidim-conferences/app/controllers/decidim/conferences/conferences_controller.rb
+++ b/decidim-conferences/app/controllers/decidim/conferences/conferences_controller.rb
@@ -8,7 +8,7 @@ class ConferencesController < Decidim::Conferences::ApplicationController
       include ParticipatorySpaceContext
       include Paginable
 
-      redesign_participatory_space_layout only: :show
+      participatory_space_layout only: :show
 
       helper Decidim::AttachmentsHelper
       helper Decidim::IconHelper
diff --git a/decidim-conferences/app/controllers/decidim/conferences/media_controller.rb b/decidim-conferences/app/controllers/decidim/conferences/media_controller.rb
index f65ad054b343b..349708e5850f5 100644
--- a/decidim-conferences/app/controllers/decidim/conferences/media_controller.rb
+++ b/decidim-conferences/app/controllers/decidim/conferences/media_controller.rb
@@ -7,7 +7,7 @@ class MediaController < Decidim::Conferences::ApplicationController
       helper Decidim::Conferences::MediaAttachmentsHelper
       helper Decidim::SanitizeHelper
 
-      redesign_participatory_space_layout only: :index
+      participatory_space_layout only: :index
 
       helper_method :collection, :conference
 
diff --git a/decidim-conferences/app/controllers/decidim/conferences/registration_types_controller.rb b/decidim-conferences/app/controllers/decidim/conferences/registration_types_controller.rb
index 86eded1e311df..529472dac36b9 100644
--- a/decidim-conferences/app/controllers/decidim/conferences/registration_types_controller.rb
+++ b/decidim-conferences/app/controllers/decidim/conferences/registration_types_controller.rb
@@ -5,7 +5,7 @@ module Conferences
     class RegistrationTypesController < Decidim::Conferences::ApplicationController
       include ParticipatorySpaceContext
 
-      redesign_participatory_space_layout only: :index
+      participatory_space_layout only: :index
 
       helper_method :collection, :conference
 
diff --git a/decidim-conferences/app/views/layouts/decidim/conference.html.erb b/decidim-conferences/app/views/layouts/decidim/conference.html.erb
index 4c4a68d2f22a0..d121bbe7c33c3 100644
--- a/decidim-conferences/app/views/layouts/decidim/conference.html.erb
+++ b/decidim-conferences/app/views/layouts/decidim/conference.html.erb
@@ -5,23 +5,11 @@
   description: translated_attribute(current_participatory_space.short_description)
 ) %>
 
-<%= render "layouts/decidim/application" do %>
-  <%= render partial: "decidim/conferences/conferences/conference_hero" %>
-  <%= render partial: "layouts/decidim/conferences_nav" %>
-  <%= cell "decidim/translation_bar", current_organization %>
-  <div class="wrapper">
-    <%= yield %>
-  </div>
+<%= append_javascript_pack_tag "decidim_conferences" %>
+<%= append_stylesheet_pack_tag "decidim_conferences" %>
 
-  <% if content_for? :expanded %>
-    <div class="expanded">
-      <div class="wrapper wrapper--inner">
-        <div class="row">
-          <%= yield :expanded %>
-        </div>
-      </div>
-    </div>
-  <% end %>
+<%= render "layouts/decidim/application" do %>
+  <%= yield %>
 <% end %>
 
 <% provide :meta_image_url, current_participatory_space.attached_uploader(:banner_image).path %>
diff --git a/decidim-conferences/app/views/layouts/decidim/conferences/application.html.erb b/decidim-conferences/app/views/layouts/decidim/conferences/application.html.erb
index 4b71e3fd76eb1..dbb7327703041 100644
--- a/decidim-conferences/app/views/layouts/decidim/conferences/application.html.erb
+++ b/decidim-conferences/app/views/layouts/decidim/conferences/application.html.erb
@@ -1,3 +1,6 @@
+<%= append_javascript_pack_tag "decidim_conferences" %>
+<%= append_stylesheet_pack_tag "decidim_conferences" %>
+
 <%= render "layouts/decidim/application" do %>
   <%= yield %>
 <% end %>
diff --git a/decidim-conferences/app/views/layouts/decidim/conferences/redesigned_application.html.erb b/decidim-conferences/app/views/layouts/decidim/conferences/redesigned_application.html.erb
deleted file mode 100644
index 4eeb9f52a5b4e..0000000000000
--- a/decidim-conferences/app/views/layouts/decidim/conferences/redesigned_application.html.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<%= append_javascript_pack_tag "decidim_conferences" %>
-<%= append_stylesheet_pack_tag "decidim_conferences" %>
-
-<%= render "layouts/decidim/redesigned_application" do %>
-  <%= yield %>
-<% end %>
diff --git a/decidim-conferences/app/views/layouts/decidim/redesigned_conference.html.erb b/decidim-conferences/app/views/layouts/decidim/redesigned_conference.html.erb
deleted file mode 100644
index 5683af5a8fb3c..0000000000000
--- a/decidim-conferences/app/views/layouts/decidim/redesigned_conference.html.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<% add_decidim_page_title(translated_attribute(current_component.name)) if try(:current_component) %>
-<% add_decidim_page_title(translated_attribute(current_participatory_space.title)) %>
-<% add_decidim_meta_tags(
-  image_url: current_participatory_space.attached_uploader(:banner_image).path,
-  description: translated_attribute(current_participatory_space.short_description)
-) %>
-
-<%= append_javascript_pack_tag "decidim_conferences" %>
-<%= append_stylesheet_pack_tag "decidim_conferences" %>
-
-<%= render "layouts/decidim/redesigned_application" do %>
-  <%= cell "decidim/translation_bar", current_organization %>
-
-  <%= yield %>
-<% end %>
-
-<% provide :meta_image_url, current_participatory_space.attached_uploader(:banner_image).path %>
diff --git a/decidim-core/app/cells/decidim/upload_modal/show.erb b/decidim-core/app/cells/decidim/upload_modal/show.erb
index f5a8125f92b27..6365885da10ca 100644
--- a/decidim-core/app/cells/decidim/upload_modal/show.erb
+++ b/decidim-core/app/cells/decidim/upload_modal/show.erb
@@ -1,3 +1,3 @@
 <%= render :files unless modal_only? %>
 
-<%= render redesign_enabled? ? :modal : :legacy_modal %>
+<%= render(redesign_enabled? ? :modal : :legacy_modal) %>
diff --git a/decidim-core/app/cells/decidim/upload_modal_cell.rb b/decidim-core/app/cells/decidim/upload_modal_cell.rb
index 7e51b9b8c3044..5aa3c2647068f 100644
--- a/decidim-core/app/cells/decidim/upload_modal_cell.rb
+++ b/decidim-core/app/cells/decidim/upload_modal_cell.rb
@@ -6,7 +6,6 @@ class UploadModalCell < Decidim::ViewModel
     include LayoutHelper
     include Cell::ViewModel::Partial
     include ERB::Util
-    include Decidim::RedesignHelper
     include Decidim::SanitizeHelper
 
     alias form model
@@ -19,6 +18,10 @@ def show
 
     private
 
+    def modal_open_key
+      redesign_enabled? ? "dialog-open" : "open"
+    end
+
     # REDESIGN_PENDING: Remove once redesign is done. This cell is called from
     # a form builder method and from there the context of controller is not
     # available
diff --git a/decidim-core/app/controllers/concerns/decidim/devise_controllers.rb b/decidim-core/app/controllers/concerns/decidim/devise_controllers.rb
index befbb896abf3d..390a6263c5daf 100644
--- a/decidim-core/app/controllers/concerns/decidim/devise_controllers.rb
+++ b/decidim-core/app/controllers/concerns/decidim/devise_controllers.rb
@@ -21,9 +21,6 @@ module DeviseControllers
       include NeedsSnippets
       include UserBlockedChecker
 
-      include RedesignLayout
-      redesign active: true
-
       helper Decidim::TranslationsHelper
       helper Decidim::MetaTagsHelper
       helper Decidim::DecidimFormHelper
diff --git a/decidim-core/app/controllers/concerns/decidim/user_profile.rb b/decidim-core/app/controllers/concerns/decidim/user_profile.rb
index 462dd997f371d..5191a0e02762b 100644
--- a/decidim-core/app/controllers/concerns/decidim/user_profile.rb
+++ b/decidim-core/app/controllers/concerns/decidim/user_profile.rb
@@ -15,7 +15,6 @@ module UserProfile
 
     included do
       helper Decidim::UserProfileHelper
-      redesign active: true
       layout "layouts/decidim/user_profile"
 
       helper_method :available_verification_workflows
diff --git a/decidim-core/app/controllers/decidim/application_controller.rb b/decidim-core/app/controllers/decidim/application_controller.rb
index 2a8260f59a9f5..8bc585675f693 100644
--- a/decidim-core/app/controllers/decidim/application_controller.rb
+++ b/decidim-core/app/controllers/decidim/application_controller.rb
@@ -24,9 +24,6 @@ class ApplicationController < ::DecidimController
     include NeedsPasswordChange
     include LinkedResourceReference
 
-    include RedesignLayout
-    redesign active: true
-
     helper Decidim::MetaTagsHelper
     helper Decidim::DecidimFormHelper
     helper Decidim::LanguageChooserHelper
diff --git a/decidim-core/app/controllers/decidim/components/base_controller.rb b/decidim-core/app/controllers/decidim/components/base_controller.rb
index 319842bca7ad5..a6bc4f6ba0921 100644
--- a/decidim-core/app/controllers/decidim/components/base_controller.rb
+++ b/decidim-core/app/controllers/decidim/components/base_controller.rb
@@ -10,7 +10,7 @@ class BaseController < Decidim::ApplicationController
       include Decidim::NeedsPermission
 
       include ParticipatorySpaceContext
-      participatory_space_layout
+      before_action :authorize_participatory_space
 
       helper Decidim::FiltersHelper
       helper Decidim::OrdersHelper
diff --git a/decidim-core/app/controllers/decidim/messaging/conversations_controller.rb b/decidim-core/app/controllers/decidim/messaging/conversations_controller.rb
index 9b8d6fdd87978..102923fb7a712 100644
--- a/decidim-core/app/controllers/decidim/messaging/conversations_controller.rb
+++ b/decidim-core/app/controllers/decidim/messaging/conversations_controller.rb
@@ -10,16 +10,12 @@ class ConversationsController < Decidim::ApplicationController
 
       helper ConversationHelper
 
-      layout "layouts/decidim/application", force_redesign: true
+      layout "layouts/decidim/application"
 
       before_action :authenticate_user!
 
       helper_method :conversation, :user_grouped_messages, :sender_is_user?, :user_groups, :validation_messages
 
-      def redesign_enabled?
-        true
-      end
-
       # Shows the form to initiate a conversation with an user (the recipient)
       # recipient is passed via GET parameter:
       #   - if the recipient does not exists, goes back to the users profile page
diff --git a/decidim-core/app/controllers/decidim/profiles_controller.rb b/decidim-core/app/controllers/decidim/profiles_controller.rb
index 6f77b31dc5b00..6f58a3b422be1 100644
--- a/decidim-core/app/controllers/decidim/profiles_controller.rb
+++ b/decidim-core/app/controllers/decidim/profiles_controller.rb
@@ -16,8 +16,6 @@ class ProfilesController < Decidim::ApplicationController
     before_action :ensure_profile_holder_is_a_user, only: [:groups, :following]
     before_action :ensure_user_not_blocked
 
-    redesign active: true
-
     def show
       return redirect_to profile_members_path if profile_holder.is_a?(Decidim::UserGroup)
 
diff --git a/decidim-core/app/controllers/decidim/user_activities_controller.rb b/decidim-core/app/controllers/decidim/user_activities_controller.rb
index 1251eb3c98799..d00f49f37bdb5 100644
--- a/decidim-core/app/controllers/decidim/user_activities_controller.rb
+++ b/decidim-core/app/controllers/decidim/user_activities_controller.rb
@@ -12,8 +12,6 @@ class UserActivitiesController < Decidim::ApplicationController
     helper Decidim::ResourceHelper
     helper_method :activities, :resource_types, :user
 
-    redesign active: true
-
     def index
       raise ActionController::RoutingError, "Missing user: #{params[:nickname]}" unless user
       raise ActionController::RoutingError, "Blocked User" if user.blocked? && !current_user&.admin?
diff --git a/decidim-core/app/helpers/decidim/action_authorization_helper.rb b/decidim-core/app/helpers/decidim/action_authorization_helper.rb
index a349846dbc6cb..47c996cd505d3 100644
--- a/decidim-core/app/helpers/decidim/action_authorization_helper.rb
+++ b/decidim-core/app/helpers/decidim/action_authorization_helper.rb
@@ -11,7 +11,7 @@ module ActionAuthorizationHelper
     #
     # Returns a String with the link.
     def action_authorized_link_to(action, *arguments, &block)
-      redesign_enabled? ? redesign_authorized_to(:link, action, arguments, block) : authorized_to(:link, action, arguments, block)
+      !respond_to?(:redesign_enabled?) || redesign_enabled? ? redesign_authorized_to(:link, action, arguments, block) : authorized_to(:link, action, arguments, block)
     end
 
     # Public: Emulates a `button_to` but conditionally renders a popup modal
@@ -23,7 +23,7 @@ def action_authorized_link_to(action, *arguments, &block)
     #
     # Returns a String with the button.
     def action_authorized_button_to(action, *arguments, &block)
-      redesign_enabled? ? redesign_authorized_to(:button, action, arguments, block) : authorized_to(:button, action, arguments, block)
+      !respond_to?(:redesign_enabled?) || redesign_enabled? ? redesign_authorized_to(:button, action, arguments, block) : authorized_to(:button, action, arguments, block)
     end
 
     # Public: Emulates a `link_to` but conditionally renders a popup modal
@@ -69,13 +69,13 @@ def authorized_to(tag, action, arguments, block)
       if !current_user
         html_options = clean_authorized_to_data_open(html_options)
 
-        html_options["data-open"] = "loginModal"
+        html_options["data-dialog-open"] = "loginModal"
         url = "#"
       elsif action && !action_authorized_to(action, resource:, permissions_holder:).ok?
         html_options = clean_authorized_to_data_open(html_options)
 
-        html_options["data-open"] = "authorizationModal"
-        html_options["data-open-url"] = modal_path(action, resource)
+        html_options["data-dialog-open"] = "authorizationModal"
+        html_options["data-dialog-remote-url"] = modal_path(action, resource)
         url = "#"
       end
 
@@ -140,8 +140,8 @@ def modal_path(action, resource)
     end
 
     def clean_authorized_to_data_open(html_options)
-      html_options.delete(:"data-open")
-      html_options.delete(:"data-open-url")
+      html_options.delete(:"data-dialog-open")
+      html_options.delete(:"data-dialog-remote-url")
 
       [:data, "data"].each do |key|
         next unless html_options[key].is_a?(Hash)
diff --git a/decidim-core/app/helpers/decidim/application_helper.rb b/decidim-core/app/helpers/decidim/application_helper.rb
index 0f4e438e8bcac..516dece0358c7 100644
--- a/decidim-core/app/helpers/decidim/application_helper.rb
+++ b/decidim-core/app/helpers/decidim/application_helper.rb
@@ -8,7 +8,6 @@ module ApplicationHelper
     include Decidim::ContextualHelpHelper
     include Decidim::AmendmentsHelper
     include Decidim::CacheHelper
-    include Decidim::RedesignHelper
 
     # Truncates a given text respecting its HTML tags.
     #
diff --git a/decidim-core/app/helpers/decidim/contextual_help_helper.rb b/decidim-core/app/helpers/decidim/contextual_help_helper.rb
index cd4b5d9e94f2a..8d058608c8772 100644
--- a/decidim-core/app/helpers/decidim/contextual_help_helper.rb
+++ b/decidim-core/app/helpers/decidim/contextual_help_helper.rb
@@ -6,9 +6,5 @@ module ContextualHelpHelper
     def floating_help(id, &)
       render partial: "decidim/shared/floating_help", locals: { content: capture(&), id: }
     end
-
-    def redesigned_floating_help(id, &)
-      render partial: "decidim/shared/redesigned_floating_help", locals: { content: capture(&), id: }
-    end
   end
 end
diff --git a/decidim-core/app/helpers/decidim/endorsable_helper.rb b/decidim-core/app/helpers/decidim/endorsable_helper.rb
index b08053a7df43b..a4e0044fef0bb 100644
--- a/decidim-core/app/helpers/decidim/endorsable_helper.rb
+++ b/decidim-core/app/helpers/decidim/endorsable_helper.rb
@@ -5,11 +5,7 @@ module Decidim
   module EndorsableHelper
     # Invokes the decidim/endorsement_buttons cell.
     def endorsement_buttons_cell(resource)
-      if redesign_enabled?
-        cell("decidim/endorsement_block", resource)
-      else
-        cell("decidim/endorsement_buttons", resource)
-      end
+      cell("decidim/endorsement_block", resource)
     end
 
     # Invokes the decidim/endorsers_list cell.
diff --git a/decidim-core/app/helpers/decidim/layout_helper.rb b/decidim-core/app/helpers/decidim/layout_helper.rb
index ee69a63ce0ee1..e48ca225aba80 100644
--- a/decidim-core/app/helpers/decidim/layout_helper.rb
+++ b/decidim-core/app/helpers/decidim/layout_helper.rb
@@ -100,7 +100,7 @@ def legacy_icon(name, options = {})
     end
 
     def icon(*args)
-      redesign_enabled? ? redesigned_icon(*args) : legacy_icon(*args)
+      !respond_to?(:redesign_enabled?) || redesign_enabled? ? redesigned_icon(*args) : legacy_icon(*args)
     end
 
     # Outputs a SVG icon from an external file. It apparently renders an image
diff --git a/decidim-core/app/helpers/decidim/participatory_space_helpers.rb b/decidim-core/app/helpers/decidim/participatory_space_helpers.rb
index e7ef238b52f4f..15bb55539e2b3 100644
--- a/decidim-core/app/helpers/decidim/participatory_space_helpers.rb
+++ b/decidim-core/app/helpers/decidim/participatory_space_helpers.rb
@@ -30,13 +30,7 @@ def participatory_space_helpers
     def participatory_space_floating_help
       return if help_section.blank?
 
-      if redesign_enabled?
-        redesigned_floating_help(help_id) { translated_attribute(help_section).html_safe }
-      else
-        content_tag "div", class: "row collapse" do
-          floating_help(help_id) { translated_attribute(help_section).html_safe }
-        end
-      end
+      floating_help(help_id) { translated_attribute(help_section).html_safe }
     end
 
     # deprecated
diff --git a/decidim-core/app/helpers/decidim/redesign_helper.rb b/decidim-core/app/helpers/decidim/redesign_helper.rb
deleted file mode 100644
index 823cc86444c2a..0000000000000
--- a/decidim-core/app/helpers/decidim/redesign_helper.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  # Module to add some redesign shared helper methods.
-  module RedesignHelper
-    # REDESIGN_PENDING: When redesign enabled for all the controllers this
-    # method will be unnecessary and the dialog-open key should be used
-    # directly instead of calling this
-    def modal_open_key
-      redesign_enabled? ? "dialog-open" : "open"
-    end
-
-    def modal_remote_key
-      redesign_enabled? ? "dialog-remote-url" : "open-url"
-    end
-
-    def data_modal_open_key
-      "data-#{modal_open_key}"
-    end
-
-    def data_modal_remote_key
-      "data-#{modal_remote_key}"
-    end
-  end
-end
diff --git a/decidim-core/app/helpers/decidim/social_share_button_helper.rb b/decidim-core/app/helpers/decidim/social_share_button_helper.rb
index ab4b171f24213..4ce0c47daac57 100644
--- a/decidim-core/app/helpers/decidim/social_share_button_helper.rb
+++ b/decidim-core/app/helpers/decidim/social_share_button_helper.rb
@@ -6,14 +6,8 @@ module SocialShareButtonHelper
     def social_share_button_tag(title, args)
       return unless enabled_services.length.positive?
 
-      if redesign_enabled?
-        content_tag :div, class: "share-modal__list", data: { social_share: "" } do
-          render_social_share_buttons(enabled_services, title, args)
-        end
-      else
-        content_tag :div, class: "social-share-button" do
-          render_social_share_buttons(enabled_services, title, args)
-        end
+      content_tag :div, class: "share-modal__list", data: { social_share: "" } do
+        render_social_share_buttons(enabled_services, title, args)
       end
     end
 
diff --git a/decidim-core/app/views/decidim/authorization_modals/_content.html.erb b/decidim-core/app/views/decidim/authorization_modals/_content.html.erb
deleted file mode 100644
index cecf59a453c26..0000000000000
--- a/decidim-core/app/views/decidim/authorization_modals/_content.html.erb
+++ /dev/null
@@ -1,49 +0,0 @@
-<button class="close-button" data-close aria-label="<%= t ".close_modal" %>" type="button">
-  <span aria-hidden="true">&times;</span>
-</button>
-
-<% if current_user && !current_user.verifiable? %>
-  <div class="reveal__header missing-confirmation">
-    <h3 class="reveal__title"><%= t ".unconfirmed.title" %></h3>
-  </div>
-  <p><%= t ".unconfirmed.explanation_html", email: current_user.email %></p>
-  <p><%= t ".unconfirmed.confirmation_instructions" %></p>
-  <div class="row">
-    <div class="columns medium-8 medium-offset-2">
-      <%= link_to t(".unconfirmed.request_confirmation_instructions"), new_confirmation_path(Decidim::User), class: "button expanded" %>
-    </div>
-  </div>
-<% else %>
-  <% base_code = authorizations.global_code || :missing %>
-  <div class="reveal__header <%= base_code %>-authorization">
-    <h3 class="reveal__title"><%= t ".#{base_code}.title" %></h3>
-  </div>
-  <% authorizations.statuses.each do |status| %>
-    <% next if status.ok? || authorizations.global_code && status.code != base_code %>
-    <p><%= t ".#{status.code}.explanation", authorization: t("#{status.handler_name}.name", scope: "decidim.authorization_handlers") %></p>
-    <% [status.data[:extra_explanation]].flatten.compact.each do |extra_explanation| %>
-      <p><%= t extra_explanation[:key], **extra_explanation[:params] %></p>
-    <% end %>
-    <% if status.data[:fields] %>
-      <ul>
-        <% status.data[:fields].each do |field, value| %>
-          <li><strong><%= t ".#{status.code}.invalid_field", field: t("#{status.handler_name}.fields.#{field}", scope: "decidim.authorization_handlers"), value: value ? "(#{value})" : "" %></strong></li>
-        <% end %>
-      </ul>
-    <% end %>
-    <div class="row">
-      <div class="columns medium-8 medium-offset-2">
-        <% if status.data[:action].present? %>
-          <%= link_to t(".#{status.code}.#{status.data[:action]}", authorization: t("#{status.handler_name}.name", scope: "decidim.authorization_handlers")), authorize_action_path(status.handler_name), class: "button expanded" %>
-        <% else %>
-          <button class="button expanded" data-close><%= t ".#{status.code}.ok" %></button>
-        <% end %>
-      </div>
-    </div>
-    <% if status.data[:cancel] %>
-      <div class="text-center">
-        <button class="link" data-close><%= t ".#{status.code}.cancel" %></button>
-      </div>
-    <% end %>
-  <% end %>
-<% end %>
diff --git a/decidim-core/app/views/decidim/authorization_modals/_redesigned_content.html.erb b/decidim-core/app/views/decidim/authorization_modals/_redesigned_content.html.erb
deleted file mode 100644
index 1b024e70c47fc..0000000000000
--- a/decidim-core/app/views/decidim/authorization_modals/_redesigned_content.html.erb
+++ /dev/null
@@ -1,49 +0,0 @@
-<%
-  base_code = authorizations.global_code || :missing
-
-  title = current_user && !current_user.verifiable? ? t("unconfirmed.title", scope: "decidim.authorization_modals.content") : t("#{base_code}.title", scope: "decidim.authorization_modals.content")
-
-  verifications = if current_user && !current_user.verifiable?
-                    messages = []
-                    messages << t("unconfirmed.explanation_html", scope: "decidim.authorization_modals.content", email: current_user.email) if current_user && !current_user.verifiable?
-                    messages << t("unconfirmed.confirmation_instructions", scope: "decidim.authorization_modals.content") if current_user && !current_user.verifiable?
-
-                    cta = { type: :a, text: t("unconfirmed.request_confirmation_instructions", scope: "decidim.authorization_modals.content"), url: new_confirmation_path(Decidim::User) }
-
-                    [[messages, cta, []]]
-                  else
-                    authorizations.statuses.map do |status|
-                      next if status.ok? || authorizations.global_code && status.code != base_code
-
-                      [status_messages(status), status_cta(status), status_fields(status)]
-                    end
-                  end.compact_blank
-%>
-<div data-dialog-container>
-  <%= icon "lock-line" %>
-  <h2 id="dialog-title-authorizationModal" tabindex="-1" data-dialog-title><%= title %></h2>
-  <div>
-    <div class="authorization-modal__verification-container">
-      <% verifications.each do |(messages, cta, fields)| %>
-        <div class="authorization-modal__verification">
-          <% messages.each do |msg| %>
-            <p><%= msg %></p>
-          <% end %>
-
-          <% if fields.any? %>
-            <ul>
-              <% fields.each do |field| %>
-                <li><%= value %></li>
-              <% end %>
-            </ul>
-          <% end %>
-
-          <%= content_tag cta[:type], class: "button button__lg button__secondary", href: cta[:url], data: cta[:data] do %>
-            <span><%= cta[:text] %></span>
-            <%= icon "arrow-right-line" %>
-          <% end %>
-        </div>
-      <% end %>
-    </div>
-  </div>
-</div>
diff --git a/decidim-core/app/views/decidim/authorization_modals/show.html.erb b/decidim-core/app/views/decidim/authorization_modals/show.html.erb
index 1b56065534d84..3696d1300bbba 100644
--- a/decidim-core/app/views/decidim/authorization_modals/show.html.erb
+++ b/decidim-core/app/views/decidim/authorization_modals/show.html.erb
@@ -1,5 +1 @@
-<% if redesign_enabled? %>
-  <%= cell "decidim/authorization_modal", authorizations %>
-<% else %>
-  <%= render partial: "decidim/authorization_modals/content" %>
-<% end %>
+<%= cell "decidim/authorization_modal", authorizations %>
diff --git a/decidim-core/app/views/decidim/devise/confirmations/new.html.erb b/decidim-core/app/views/decidim/devise/confirmations/new.html.erb
index e6f109cb4d6fc..cc962de9b2bae 100644
--- a/decidim-core/app/views/decidim/devise/confirmations/new.html.erb
+++ b/decidim-core/app/views/decidim/devise/confirmations/new.html.erb
@@ -20,7 +20,7 @@
     </div>
 
     <div class="login__links">
-      <%= render "decidim/devise/shared/redesigned_links" %>
+      <%= render "decidim/devise/shared/links" %>
     </div>
   <% end %>
 
diff --git a/decidim-core/app/views/decidim/devise/passwords/edit.html.erb b/decidim-core/app/views/decidim/devise/passwords/edit.html.erb
index 85e7f9d9665f0..ee1e25a0b5b55 100644
--- a/decidim-core/app/views/decidim/devise/passwords/edit.html.erb
+++ b/decidim-core/app/views/decidim/devise/passwords/edit.html.erb
@@ -24,7 +24,7 @@
 
     <% unless current_user %>
       <div class="login__links">
-        <%= render "decidim/devise/shared/redesigned_links" %>
+        <%= render "decidim/devise/shared/links" %>
       </div>
     <% end %>
   <% end %>
diff --git a/decidim-core/app/views/decidim/devise/passwords/new.html.erb b/decidim-core/app/views/decidim/devise/passwords/new.html.erb
index 64d5371dd3e7b..ddd5d8dad12e5 100644
--- a/decidim-core/app/views/decidim/devise/passwords/new.html.erb
+++ b/decidim-core/app/views/decidim/devise/passwords/new.html.erb
@@ -20,7 +20,7 @@
     </div>
 
     <div class="login__links">
-      <%= render "decidim/devise/shared/redesigned_links" %>
+      <%= render "decidim/devise/shared/links" %>
     </div>
   <% end %>
 
diff --git a/decidim-core/app/views/decidim/devise/registrations/new.html.erb b/decidim-core/app/views/decidim/devise/registrations/new.html.erb
index ab9bc399badf4..94e3e171b333e 100644
--- a/decidim-core/app/views/decidim/devise/registrations/new.html.erb
+++ b/decidim-core/app/views/decidim/devise/registrations/new.html.erb
@@ -69,7 +69,7 @@
     </div>
 
     <div class="login__links">
-      <%= render "decidim/devise/shared/redesigned_links" %>
+      <%= render "decidim/devise/shared/links" %>
     </div>
   <% end %>
 <% end %>
diff --git a/decidim-core/app/views/decidim/devise/sessions/new.html.erb b/decidim-core/app/views/decidim/devise/sessions/new.html.erb
index 5b1b6f748dad6..e3d7aad410061 100644
--- a/decidim-core/app/views/decidim/devise/sessions/new.html.erb
+++ b/decidim-core/app/views/decidim/devise/sessions/new.html.erb
@@ -49,7 +49,7 @@
       </div>
 
       <div class="login__links">
-        <%= render "decidim/devise/shared/redesigned_links" %>
+        <%= render "decidim/devise/shared/links" %>
       </div>
     <% end %>
 
diff --git a/decidim-core/app/views/decidim/devise/shared/_links.html.erb b/decidim-core/app/views/decidim/devise/shared/_links.html.erb
index e8418f50164c5..00f82f06f2671 100644
--- a/decidim-core/app/views/decidim/devise/shared/_links.html.erb
+++ b/decidim-core/app/views/decidim/devise/shared/_links.html.erb
@@ -1,29 +1,19 @@
 <%- if controller_name != "sessions" && resource_class != Decidim::UserGroup %>
-  <p class="text-center">
-    <%= link_to t("devise.shared.links.sign_in"), new_session_path(resource_name) %>
-  </p>
+  <%= link_to t("devise.shared.links.sign_in"), new_session_path(resource_name) %>
 <% end -%>
 
 <%- if current_organization.sign_up_enabled? && devise_mapping.registerable? && controller_name != "registrations" %>
-  <p class="text-center">
-    <%= link_to t("devise.shared.links.sign_up"), new_registration_path(resource_name) %>
-  </p>
+  <%= link_to t("devise.shared.links.sign_up"), new_registration_path(resource_name) %>
 <% end -%>
 
 <%- if devise_mapping.recoverable? && controller_name != "passwords" %>
-  <p class="text-center">
-    <%= link_to t("devise.shared.links.forgot_your_password"), new_password_path(resource_name) %>
-  </p>
+  <%= link_to t("devise.shared.links.forgot_your_password"), new_password_path(resource_name) %>
 <% end -%>
 
 <%- if current_organization.sign_up_enabled? && devise_mapping.confirmable? && controller_name != "confirmations" %>
-  <p class="text-center">
-    <%= link_to t("devise.shared.links.didn_t_receive_confirmation_instructions"), new_confirmation_path(resource_name) %>
-  </p>
+  <%= link_to t("devise.shared.links.didn_t_receive_confirmation_instructions"), new_confirmation_path(resource_name) %>
 <% end -%>
 
 <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != "unlocks" %>
-  <p class="text-center">
-    <%= link_to t("devise.shared.links.didn_t_receive_unlock_instructions"), new_unlock_path(resource_name) %>
-  </p>
+  <%= link_to t("devise.shared.links.didn_t_receive_unlock_instructions"), new_unlock_path(resource_name) %>
 <% end -%>
diff --git a/decidim-core/app/views/decidim/devise/shared/_omniauth_buttons.html.erb b/decidim-core/app/views/decidim/devise/shared/_omniauth_buttons.html.erb
index c3bdb1ee708dd..2e7e0f8ab44b8 100644
--- a/decidim-core/app/views/decidim/devise/shared/_omniauth_buttons.html.erb
+++ b/decidim-core/app/views/decidim/devise/shared/_omniauth_buttons.html.erb
@@ -2,8 +2,7 @@
 <% if Devise.mappings[:user].omniauthable? && current_organization.enabled_omniauth_providers.any? %>
   <div class="login__omniauth<%= " login__omniauth__horizontal" if is_horizontal %>">
     <%- current_organization.enabled_omniauth_providers.keys.each do |provider| %>
-      <%# REDESIGN_PENDING: The current classes breaks the accessibility of the page with legacy design. Please, review it it works with the redesigned layout %>
-      <% link_classes = Decidim.redesign_active ? "login__omniauth-button button--#{normalize_provider_name(provider)}" : "" %>
+      <% link_classes = "login__omniauth-button button--#{normalize_provider_name(provider)}" %>
       <%= link_to decidim.send("user_#{provider}_omniauth_authorize_path"), class: link_classes, method: :post, title: t("devise.shared.links.sign_in_with_provider", provider: normalize_provider_name(provider).titleize) do %>
         <%= oauth_icon provider %>
         <span>
diff --git a/decidim-core/app/views/decidim/devise/shared/_redesigned_links.html.erb b/decidim-core/app/views/decidim/devise/shared/_redesigned_links.html.erb
deleted file mode 100644
index 00f82f06f2671..0000000000000
--- a/decidim-core/app/views/decidim/devise/shared/_redesigned_links.html.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<%- if controller_name != "sessions" && resource_class != Decidim::UserGroup %>
-  <%= link_to t("devise.shared.links.sign_in"), new_session_path(resource_name) %>
-<% end -%>
-
-<%- if current_organization.sign_up_enabled? && devise_mapping.registerable? && controller_name != "registrations" %>
-  <%= link_to t("devise.shared.links.sign_up"), new_registration_path(resource_name) %>
-<% end -%>
-
-<%- if devise_mapping.recoverable? && controller_name != "passwords" %>
-  <%= link_to t("devise.shared.links.forgot_your_password"), new_password_path(resource_name) %>
-<% end -%>
-
-<%- if current_organization.sign_up_enabled? && devise_mapping.confirmable? && controller_name != "confirmations" %>
-  <%= link_to t("devise.shared.links.didn_t_receive_confirmation_instructions"), new_confirmation_path(resource_name) %>
-<% end -%>
-
-<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != "unlocks" %>
-  <%= link_to t("devise.shared.links.didn_t_receive_unlock_instructions"), new_unlock_path(resource_name) %>
-<% end -%>
diff --git a/decidim-core/app/views/decidim/devise/unlocks/new.html.erb b/decidim-core/app/views/decidim/devise/unlocks/new.html.erb
index 8ccaee79a02ae..7d1faccfa8638 100644
--- a/decidim-core/app/views/decidim/devise/unlocks/new.html.erb
+++ b/decidim-core/app/views/decidim/devise/unlocks/new.html.erb
@@ -20,7 +20,7 @@
     </div>
 
     <div class="login__links">
-      <%= render "decidim/devise/shared/redesigned_links" %>
+      <%= render "decidim/devise/shared/links" %>
     </div>
   <% end %>
 
diff --git a/decidim-core/app/views/decidim/endorsements/update_buttons_and_counters.js.erb b/decidim-core/app/views/decidim/endorsements/update_buttons_and_counters.js.erb
index 8e6650a5a358d..b67952dfbb2ad 100644
--- a/decidim-core/app/views/decidim/endorsements/update_buttons_and_counters.js.erb
+++ b/decidim-core/app/views/decidim/endorsements/update_buttons_and_counters.js.erb
@@ -1,53 +1,27 @@
-<% render_endorsement_cell_method = redesign_enabled? ? :show : :render_user_identity_endorse_button %>
+updateEndorsementBlock();
 
-<% if redesign_enabled? %>
-  updateEndorsementBlock();
+function updateEndorsementBlock() {
+  var $endorsementBlock = $('#resource-<%= resource.id %>-endorsement-block');
+  var $endorsementListTrigger = $('#resource-<%= resource.id %>-endorsement-block #dropdown-trigger');
+  var $endorsementButton = $('#resource-<%= resource.id %>-endorsement-button');
+  var $endorsementIdentitiesButton = $('#resource-<%= resource.id %>-endorsement-button #select-identity-button');
+  var $endorsementListGrid = $('#dropdown-menu-endorsers-list .endorsers-list__grid');
+  var endorsersCount = <%= j(cell("decidim/endorsers_list", resource).endorsers_count) %>
 
-  function updateEndorsementBlock() {
-    var $endorsementBlock = $('#resource-<%= resource.id %>-endorsement-block');
-    var $endorsementListTrigger = $('#resource-<%= resource.id %>-endorsement-block #dropdown-trigger');
-    var $endorsementButton = $('#resource-<%= resource.id %>-endorsement-button');
-    var $endorsementIdentitiesButton = $('#resource-<%= resource.id %>-endorsement-button #select-identity-button');
-    var $endorsementListGrid = $('#dropdown-menu-endorsers-list .endorsers-list__grid');
-    var endorsersCount = <%= j(cell("decidim/endorsers_list", resource).endorsers_count) %>
-
-    $endorsementListTrigger[0].innerHTML = '<%= j(cell("decidim/endorsers_list", resource)).strip.html_safe %>';
-    $endorsementListGrid[0].innerHTML = '<%= j(cell("decidim/endorsers_list", resource).full_endorsers_list).strip.html_safe %>';
-    if (endorsersCount > 0) {
-      $endorsementListTrigger.removeClass('hidden');
-    } else {
-      $endorsementListTrigger.addClass('hidden');
-    }
-
-    <%# If the endorsement button displays a modal to select the identity to endorse only the content of the button %>
-    <%# has to be updated to maintain the function of the button to open the modal. Otherwise the button has to be fully %>
-    <%# updated because the form request also changes %>
-    if ($endorsementIdentitiesButton.length == 0) {
-      $endorsementButton[0].outerHTML = '<%= j(cell("decidim/endorsement_buttons", resource).show).strip.html_safe %>';
-    } else {
-      $endorsementIdentitiesButton[0].innerHTML = '<%= j(cell("decidim/endorsement_buttons", resource).button_content).strip.html_safe %>';
-    }
-  }
-<% else %>
-  <% if Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.empty? %>
-    update_main_page_button();
-  <% end %>
-  update_identities_rows();
-
-  function update_identities_rows() {
-    <% fully_endorsed = fully_endorsed?(resource, current_user) %>
-    var $endorsementsRowCount = $('#resource-<%= resource.id %>-endorsements-count');
-    morphdom($endorsementsRowCount[0], '<%= j(endorsement_buttons_cell(resource).render_endorsements_count).strip.html_safe %>');
-    var $endorsementsRowButton = $($('#select-identity-button')[0]);
-    <% if fully_endorsed %>
-      $endorsementsRowButton.addClass('active')
-    <% else %>
-      $endorsementsRowButton.removeClass('active')
-    <% end %>
+  $endorsementListTrigger[0].innerHTML = '<%= j(cell("decidim/endorsers_list", resource)).strip.html_safe %>';
+  $endorsementListGrid[0].innerHTML = '<%= j(cell("decidim/endorsers_list", resource).full_endorsers_list).strip.html_safe %>';
+  if (endorsersCount > 0) {
+    $endorsementListTrigger.removeClass('hidden');
+  } else {
+    $endorsementListTrigger.addClass('hidden');
   }
 
-  function update_main_page_button() {
-    var $endorsementButton = $('#resource-<%= resource.id %>-endorsement-button');
-    morphdom($endorsementButton[0], '<%= j(endorsement_buttons_cell(resource).send(render_endorsement_cell_method)).strip.html_safe %>');
+  <%# If the endorsement button displays a modal to select the identity to endorse only the content of the button %>
+  <%# has to be updated to maintain the function of the button to open the modal. Otherwise the button has to be fully %>
+  <%# updated because the form request also changes %>
+  if ($endorsementIdentitiesButton.length == 0) {
+    $endorsementButton[0].outerHTML = '<%= j(cell("decidim/endorsement_buttons", resource).show).strip.html_safe %>';
+  } else {
+    $endorsementIdentitiesButton[0].innerHTML = '<%= j(cell("decidim/endorsement_buttons", resource).button_content).strip.html_safe %>';
   }
-<% end %>
+}
diff --git a/decidim-core/app/views/decidim/shared/_authorization_modal.html.erb b/decidim-core/app/views/decidim/shared/_authorization_modal.html.erb
index 37687e4d04960..604b9a314b453 100644
--- a/decidim-core/app/views/decidim/shared/_authorization_modal.html.erb
+++ b/decidim-core/app/views/decidim/shared/_authorization_modal.html.erb
@@ -1 +1 @@
-<div class="reveal" id="authorizationModal" data-reveal></div>
+<%= decidim_modal id: "authorizationModal", remote: true, class: "authorization-modal" %>
diff --git a/decidim-core/app/views/decidim/shared/_confirm_modal.html.erb b/decidim-core/app/views/decidim/shared/_confirm_modal.html.erb
index 4a84bdd0a2c2b..b51913c268f7e 100644
--- a/decidim-core/app/views/decidim/shared/_confirm_modal.html.erb
+++ b/decidim-core/app/views/decidim/shared/_confirm_modal.html.erb
@@ -1,18 +1,17 @@
-<div class="small reveal confirm-reveal" id="confirm-modal" aria-hidden="true" role="dialog" aria-labelledby="confirm-modal-title" data-reveal data-multiple-opened="true">
-  <div class="reveal__header">
-    <h2 class="reveal__title" id="confirm-modal-title"><%= t(".title") %></h2>
-    <button class="close-button" data-close aria-label="<%= t(".close_modal") %>"
-      type="button">
-      <span aria-hidden="true">&times;</span>
-    </button>
-  </div>
-  <div class="confirm-content">
-    <div class="confirm-modal-content"></div>
+<%= decidim_modal id: "confirm-modal" do %>
+  <div data-dialog-container>
+    <%= icon "delete-bin-line" %>
+    <h2 class="h2" data-dialog-title id="dialog-title-confirm-modal"><%= t("title", scope: "decidim.shared.confirm_modal") %></h2>
+
+    <div data-confirm-modal-content></div>
   </div>
-  <div class="confirm-modal-footer reveal__footer">
-    <div class="buttons button--double">
-      <a class="button" role="button" href="#" data-confirm-ok aria-label="<%= t(".ok") %>"><%= t(".ok") %></a>
-      <a class="button clear" role="button" href="#" data-confirm-cancel aria-label="<%= t(".cancel") %>"><%= t(".cancel") %></a>
-    </div>
+
+  <div data-dialog-actions>
+    <button class="button button__lg button__transparent-secondary" data-confirm-cancel data-dialog-close="confirm-modal">
+      <span><%= t("cancel", scope: "decidim.shared.confirm_modal") %></span>
+    </button>
+    <button class="button button__lg button__secondary" data-confirm-ok>
+      <span><%= t("ok", scope: "decidim.shared.confirm_modal") %></span>
+    </button>
   </div>
-</div>
+<% end %>
diff --git a/decidim-core/app/views/decidim/shared/_floating_help.html.erb b/decidim-core/app/views/decidim/shared/_floating_help.html.erb
index 4eb72a96e00a2..3407e7285a904 100644
--- a/decidim-core/app/views/decidim/shared/_floating_help.html.erb
+++ b/decidim-core/app/views/decidim/shared/_floating_help.html.erb
@@ -1,30 +1,16 @@
-<div class="floating-helper-container" data-help-id="floating-help-<%= id %>">
-  <div class="floating-helper" id="floating-helper-tip" data-toggler=".hide">
-    <div class="floating-helper__layout">
-      <a href="#floating-helper-block" class="floating-helper__trigger" data-toggle="floating-helper-block floating-helper-tip">
-        <div class="floating-helper__text">
-          <%= t ".help" %>
-        </div>
-        <div class="floating-helper__icon">
-          <%= icon "question-mark", class: "icon--small", role: "img", aria_label: t(".help") %>
-        </div>
-      </a>
-    </div>
-  </div>
+<div id="floating-helper-tip" data-floating-help>
+  <button class="button button__xs button__text-secondary" data-dialog-open="floating-helper-block">
+    <%= icon "question-line" %>
+    <span><%= t("help", scope: "decidim.shared.floating_help") %></span>
+  </button>
+</div>
 
-  <div id="floating-helper-block" class="floating-helper__wrapper row column hide" data-toggler=".hide">
-    <div class="floating-helper__content">
-      <div class="floating-helper__content-inner">
-        <div class="floating-helper__icon-big show-for-medium">
-          <%= icon "question-mark", class: "icon--large", role: "img", aria_label: t(".help") %>
-        </div>
-        <div class="mb-s">
-          <%= content %>
-        </div>
-      </div>
+<%= decidim_modal id: "floating-helper-block" do %>
+  <div data-dialog-container>
+    <%= icon "question-line" %>
+    <h3 id="dialog-title-floating-helper-block" data-dialog-title><%= t("help", scope: "decidim.shared.floating_help") %></h3>
+    <div class="editor-content">
+      <%= content %>
     </div>
-    <a href="#floating-helper-tip" class="floating-helper__content-close" data-toggle="floating-helper-block floating-helper-tip">
-      <%= icon "x", class: "icon--small", role: "img", aria_label: t(".close") %>
-    </a>
   </div>
-</div>
+<% end %>
diff --git a/decidim-core/app/views/decidim/shared/_login_modal.html.erb b/decidim-core/app/views/decidim/shared/_login_modal.html.erb
index 2bacaafc62985..0c4e21a2e6a8c 100644
--- a/decidim-core/app/views/decidim/shared/_login_modal.html.erb
+++ b/decidim-core/app/views/decidim/shared/_login_modal.html.erb
@@ -1,57 +1,53 @@
-<div class="reveal" id="loginModal" data-reveal role="dialog" aria-modal="true" aria-labelledby="loginModal-label">
-  <div class="reveal__header">
-    <h2 id="loginModal-label" class="reveal__title"><%= t(".please_sign_in") %></h2>
-    <button class="close-button" data-close aria-label="<%= t(".close_modal") %>"
-      type="button">
-      <span aria-hidden="true">&times;</span>
-    </button>
-  </div>
-  <% if current_organization.sign_in_enabled? %>
-    <% cache current_organization do %>
-      <%= render "decidim/devise/shared/omniauth_buttons_mini" %>
-    <% end %>
-    <div class="row">
-      <div class="columns medium-8 medium-centered">
-          <%
-            path = if content_for(:redirect_after_login)
-                     session_path(:user, redirect_url: content_for(:redirect_after_login))
-                   else
-                     session_path(:user)
-                   end
-          %>
-          <%= decidim_form_for(Decidim::User.new, namespace: "login", as: :user, url: path, html: { class: "register-form new_user" }) do |f| %>
-            <div>
-              <div class="field">
-                <%= f.email_field :email %>
-              </div>
-              <div class="field">
-                <%= f.password_field :password, autocomplete: "off" %>
-              </div>
-            </div>
-            <div class="actions">
-              <%= f.submit t("devise.sessions.new.sign_in"), class: "button expanded" %>
-            </div>
-          <% end %>
-          <% if current_organization.sign_up_enabled? %>
-            <p class="text-center">
-              <%= link_to t(".sign_up"), decidim.new_user_registration_path, class: "sign-up-link" %>
-            </p>
+<%= decidim_modal id: "loginModal", class: "login__modal" do %>
+
+  <%
+  path = if content_for(:redirect_after_login)
+           session_path(:user, redirect_url: content_for(:redirect_after_login))
+         else
+           session_path(:user)
+         end
+  %>
+
+  <%= decidim_form_for(Decidim::User.new, namespace: "login", as: :user, url: path, html: { class: nil }) do |f| %>
+    <div data-dialog-container>
+      <%= icon "login-box-line", class: "w-6 h-6 text-gray fill-current" %>
+      <h3 id="dialog-title-loginModal" class="h3"><%= t(".please_sign_in") %></h3>
+      <div>
+        <% if current_organization.sign_in_enabled? %>
+          <% cache current_organization do %>
+            <%= render partial: "decidim/devise/shared/omniauth_buttons", locals: { is_horizontal: true } %>
           <% end %>
-          <p class="text-center">
+
+          <div class="form__wrapper">
+            <%= f.email_field :email, autocomplete: "email", placeholder: "hi@email.com" %>
+
+            <%= f.password_field :password, autocomplete: "current-password", placeholder: "••••••" %>
+          </div>
+
+          <div class="login__modal-links">
+            <%= link_to t(".sign_up"), decidim.new_user_registration_path, class: "sign-up-link" if current_organization.sign_up_enabled? %>
             <%= link_to t("devise.shared.links.forgot_your_password"), new_password_path(:user) %>
-          </p>
+          </div>
+        <% else %>
+          <%= cell("decidim/announcement", t("sign_in_disabled", scope: "decidim.devise.sessions.new"), callout_class: "warning" ) %>
+
+          <% cache current_organization do %>
+            <%= render partial: "decidim/devise/shared/omniauth_buttons", locals: { is_horizontal: true } %>
+          <% end %>
+        <% end %>
       </div>
     </div>
-  <% else %>
-    <div class="row">
-      <div class="columns medium-8 medium-centered">
-        <p>
-          <%= t("sign_in_disabled", scope: "decidim.devise.sessions.new") %>
-        </p>
+
+    <% if current_organization.sign_in_enabled? %>
+      <div data-dialog-actions>
+        <button class="button button__lg button__transparent-secondary" data-dialog-close="loginModal">
+          <%= t("cancel", scope: "decidim.admin.actions") %>
+        </button>
+        <button type="submit" class="button button__lg button__secondary">
+          <%= t("devise.sessions.new.sign_in") %>
+          <%= icon "arrow-right-line", class: "fill-current" %>
+        </button>
       </div>
-    </div>
-    <% cache current_organization do %>
-      <%= render "decidim/devise/shared/omniauth_buttons" %>
     <% end %>
   <% end %>
-</div>
+<% end %>
diff --git a/decidim-core/app/views/decidim/shared/_redesigned_authorization_modal.html.erb b/decidim-core/app/views/decidim/shared/_redesigned_authorization_modal.html.erb
deleted file mode 100644
index 604b9a314b453..0000000000000
--- a/decidim-core/app/views/decidim/shared/_redesigned_authorization_modal.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= decidim_modal id: "authorizationModal", remote: true, class: "authorization-modal" %>
diff --git a/decidim-core/app/views/decidim/shared/_redesigned_confirm_modal.html.erb b/decidim-core/app/views/decidim/shared/_redesigned_confirm_modal.html.erb
deleted file mode 100644
index b51913c268f7e..0000000000000
--- a/decidim-core/app/views/decidim/shared/_redesigned_confirm_modal.html.erb
+++ /dev/null
@@ -1,17 +0,0 @@
-<%= decidim_modal id: "confirm-modal" do %>
-  <div data-dialog-container>
-    <%= icon "delete-bin-line" %>
-    <h2 class="h2" data-dialog-title id="dialog-title-confirm-modal"><%= t("title", scope: "decidim.shared.confirm_modal") %></h2>
-
-    <div data-confirm-modal-content></div>
-  </div>
-
-  <div data-dialog-actions>
-    <button class="button button__lg button__transparent-secondary" data-confirm-cancel data-dialog-close="confirm-modal">
-      <span><%= t("cancel", scope: "decidim.shared.confirm_modal") %></span>
-    </button>
-    <button class="button button__lg button__secondary" data-confirm-ok>
-      <span><%= t("ok", scope: "decidim.shared.confirm_modal") %></span>
-    </button>
-  </div>
-<% end %>
diff --git a/decidim-core/app/views/decidim/shared/_redesigned_floating_help.html.erb b/decidim-core/app/views/decidim/shared/_redesigned_floating_help.html.erb
deleted file mode 100644
index 3407e7285a904..0000000000000
--- a/decidim-core/app/views/decidim/shared/_redesigned_floating_help.html.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<div id="floating-helper-tip" data-floating-help>
-  <button class="button button__xs button__text-secondary" data-dialog-open="floating-helper-block">
-    <%= icon "question-line" %>
-    <span><%= t("help", scope: "decidim.shared.floating_help") %></span>
-  </button>
-</div>
-
-<%= decidim_modal id: "floating-helper-block" do %>
-  <div data-dialog-container>
-    <%= icon "question-line" %>
-    <h3 id="dialog-title-floating-helper-block" data-dialog-title><%= t("help", scope: "decidim.shared.floating_help") %></h3>
-    <div class="editor-content">
-      <%= content %>
-    </div>
-  </div>
-<% end %>
diff --git a/decidim-core/app/views/decidim/shared/_redesigned_login_modal.html.erb b/decidim-core/app/views/decidim/shared/_redesigned_login_modal.html.erb
deleted file mode 100644
index 0c4e21a2e6a8c..0000000000000
--- a/decidim-core/app/views/decidim/shared/_redesigned_login_modal.html.erb
+++ /dev/null
@@ -1,53 +0,0 @@
-<%= decidim_modal id: "loginModal", class: "login__modal" do %>
-
-  <%
-  path = if content_for(:redirect_after_login)
-           session_path(:user, redirect_url: content_for(:redirect_after_login))
-         else
-           session_path(:user)
-         end
-  %>
-
-  <%= decidim_form_for(Decidim::User.new, namespace: "login", as: :user, url: path, html: { class: nil }) do |f| %>
-    <div data-dialog-container>
-      <%= icon "login-box-line", class: "w-6 h-6 text-gray fill-current" %>
-      <h3 id="dialog-title-loginModal" class="h3"><%= t(".please_sign_in") %></h3>
-      <div>
-        <% if current_organization.sign_in_enabled? %>
-          <% cache current_organization do %>
-            <%= render partial: "decidim/devise/shared/omniauth_buttons", locals: { is_horizontal: true } %>
-          <% end %>
-
-          <div class="form__wrapper">
-            <%= f.email_field :email, autocomplete: "email", placeholder: "hi@email.com" %>
-
-            <%= f.password_field :password, autocomplete: "current-password", placeholder: "••••••" %>
-          </div>
-
-          <div class="login__modal-links">
-            <%= link_to t(".sign_up"), decidim.new_user_registration_path, class: "sign-up-link" if current_organization.sign_up_enabled? %>
-            <%= link_to t("devise.shared.links.forgot_your_password"), new_password_path(:user) %>
-          </div>
-        <% else %>
-          <%= cell("decidim/announcement", t("sign_in_disabled", scope: "decidim.devise.sessions.new"), callout_class: "warning" ) %>
-
-          <% cache current_organization do %>
-            <%= render partial: "decidim/devise/shared/omniauth_buttons", locals: { is_horizontal: true } %>
-          <% end %>
-        <% end %>
-      </div>
-    </div>
-
-    <% if current_organization.sign_in_enabled? %>
-      <div data-dialog-actions>
-        <button class="button button__lg button__transparent-secondary" data-dialog-close="loginModal">
-          <%= t("cancel", scope: "decidim.admin.actions") %>
-        </button>
-        <button type="submit" class="button button__lg button__secondary">
-          <%= t("devise.sessions.new.sign_in") %>
-          <%= icon "arrow-right-line", class: "fill-current" %>
-        </button>
-      </div>
-    <% end %>
-  <% end %>
-<% end %>
diff --git a/decidim-core/app/views/decidim/shared/_redesigned_share_modal.html.erb b/decidim-core/app/views/decidim/shared/_redesigned_share_modal.html.erb
deleted file mode 100644
index 05122bbf85ba0..0000000000000
--- a/decidim-core/app/views/decidim/shared/_redesigned_share_modal.html.erb
+++ /dev/null
@@ -1,26 +0,0 @@
-<%= decidim_modal id: "socialShare", class: "share-modal" do %>
-<div data-dialog-container>
-  <%= icon "share-line" %>
-  <h2 id="dialog-title-socialShare" tabindex="-1" data-dialog-title><%= t("share", scope: "decidim.shared.share_modal") %></h2>
-  <div>
-    <%= social_share_button_tag(decidim_page_title,
-      url: decidim_meta_url,
-      image: decidim_meta_image_url,
-      desc: h(decidim_meta_description),
-      via: decidim_meta_twitter_handler) %>
-
-    <div class="share-modal__input">
-      <input id="urlShareLink" type="text" title="<%= t("share_link" , scope: "decidim.shared.share_modal") %>" value="<%= decidim_meta_url %>" readonly>
-      <button type="button"
-        class="button button__sm button__text-secondary"
-        data-clipboard-copy="#urlShareLink"
-        data-clipboard-copy-label="<%= t("copy_share_link_copied", scope: "decidim.shared.share_modal") %>"
-        data-clipboard-copy-message="<%= t("copy_share_link_message", scope: "decidim.shared.share_modal") %>"
-        title="<%= t("copy_share_link_clarification", scope: "decidim.shared.share_modal") %>">
-        <span><%= t("copy_share_link", scope: "decidim.shared.share_modal") %></span>
-        <%= icon "file-copy-line" %>
-      </button>
-    </div>
-  </div>
-</div>
-<% end %>
diff --git a/decidim-core/app/views/decidim/shared/_share_modal.html.erb b/decidim-core/app/views/decidim/shared/_share_modal.html.erb
index d384c6c62b9fc..05122bbf85ba0 100644
--- a/decidim-core/app/views/decidim/shared/_share_modal.html.erb
+++ b/decidim-core/app/views/decidim/shared/_share_modal.html.erb
@@ -1,49 +1,26 @@
-<div class="text-center">
-  <button class="share-link link text-center" data-open="socialShare">
-    <%= t(".share") %>
-    <% if try(:resource) %>
-      <span class="show-for-sr"><%= resource_title(resource) %></span>
-    <% end %>
-    <%= icon "share", class: "icon--after", role: "img", "aria-hidden": true %>
-  </button>
-</div>
-<div class="reveal" id="socialShare" data-reveal>
-  <div class="reveal__header">
-    <h3 class="reveal__title"><%= t(".share") %>:</h3>
-    <button class="close-button" data-close aria-label="<%= t(".close_window") %>" type="button">
-      <span aria-hidden="true">&times;</span>
-    </button>
-  </div>
-  <div class="button-group text-center">
-  <%= social_share_button_tag(decidim_page_title,
-        url: decidim_meta_url,
-        image: decidim_meta_image_url,
-        desc: h(decidim_meta_description),
-        via: decidim_meta_twitter_handler) %>
-    <a href="#" class="button" data-open="urlShare">
-      <%= icon "link-intact", role: "img", "aria-hidden": true %>
-      <%= t(".share_link") %>
-    </a>
-  </div>
-</div>
-<div class="reveal" id="urlShare" data-reveal>
-  <div class="reveal__header">
-    <h3 class="reveal__title"><%= t(".share_link") %>:</h3>
-    <button class="close-button" data-close aria-label="<%= t(".close_window") %>" type="button">
-      <span aria-hidden="true">&times;</span>
-    </button>
-  </div>
-  <div class="input-group">
-    <input id="urlShareLink" class="input-group-field" type="text" title="<%= t(".share_link") %>" value="<%= "#{decidim_meta_url}" %>" readonly>
-    <div class="input-group-button">
-      <button class="button primary"
+<%= decidim_modal id: "socialShare", class: "share-modal" do %>
+<div data-dialog-container>
+  <%= icon "share-line" %>
+  <h2 id="dialog-title-socialShare" tabindex="-1" data-dialog-title><%= t("share", scope: "decidim.shared.share_modal") %></h2>
+  <div>
+    <%= social_share_button_tag(decidim_page_title,
+      url: decidim_meta_url,
+      image: decidim_meta_image_url,
+      desc: h(decidim_meta_description),
+      via: decidim_meta_twitter_handler) %>
+
+    <div class="share-modal__input">
+      <input id="urlShareLink" type="text" title="<%= t("share_link" , scope: "decidim.shared.share_modal") %>" value="<%= decidim_meta_url %>" readonly>
+      <button type="button"
+        class="button button__sm button__text-secondary"
         data-clipboard-copy="#urlShareLink"
-        data-clipboard-copy-label="<%= t(".copy_share_link_copied") %>"
-        data-clipboard-copy-message="<%= t(".copy_share_link_message") %>"
-        aria-label="<%= t(".copy_share_link_clarification") %>">
-          <%= icon "clipboard", role: "img", "aria-hidden": true %>
-          <%= t(".copy_share_link") %>
+        data-clipboard-copy-label="<%= t("copy_share_link_copied", scope: "decidim.shared.share_modal") %>"
+        data-clipboard-copy-message="<%= t("copy_share_link_message", scope: "decidim.shared.share_modal") %>"
+        title="<%= t("copy_share_link_clarification", scope: "decidim.shared.share_modal") %>">
+        <span><%= t("copy_share_link", scope: "decidim.shared.share_modal") %></span>
+        <%= icon "file-copy-line" %>
       </button>
     </div>
   </div>
 </div>
+<% end %>
diff --git a/decidim-core/app/views/decidim/shared/filters/_redesigned_check_boxes_tree.html.erb b/decidim-core/app/views/decidim/shared/filters/_check_boxes_tree.html.erb
similarity index 100%
rename from decidim-core/app/views/decidim/shared/filters/_redesigned_check_boxes_tree.html.erb
rename to decidim-core/app/views/decidim/shared/filters/_check_boxes_tree.html.erb
diff --git a/decidim-core/app/views/decidim/shared/filters/_redesigned_collection.html.erb b/decidim-core/app/views/decidim/shared/filters/_collection.html.erb
similarity index 100%
rename from decidim-core/app/views/decidim/shared/filters/_redesigned_collection.html.erb
rename to decidim-core/app/views/decidim/shared/filters/_collection.html.erb
diff --git a/decidim-core/app/views/layouts/decidim/_admin_links.html.erb b/decidim-core/app/views/layouts/decidim/_admin_links.html.erb
index a4d27edf63c7c..abd7dba4623cd 100644
--- a/decidim-core/app/views/layouts/decidim/_admin_links.html.erb
+++ b/decidim-core/app/views/layouts/decidim/_admin_links.html.erb
@@ -1,18 +1,11 @@
-<% if redesign_enabled? %>
-  <div id="admin-bar" class="admin-bar__container">
-    <div class="admin-bar">
-      <span class="admin-bar__title"><%= t("decidim.admin.titles.panel") %></span>
-      <%= link_to decidim_admin.root_path, class: "admin-bar__button" do %>
-        <span><%= t("layouts.decidim.user_menu.admin_dashboard") %></span>
-        <%= icon "equalizer-line" %>
-      <% end %>
-      <%= content_for(:extra_admin_link) if content_for?(:extra_admin_link) %>
-      <%= content_for(:edit_link) if content_for?(:edit_link) %>
-    </div>
-  </div>
-<% else %>
-  <div class="main-nav__link">
+<div id="admin-bar" class="admin-bar__container">
+  <div class="admin-bar">
+    <span class="admin-bar__title"><%= t("decidim.admin.titles.panel") %></span>
+    <%= link_to decidim_admin.root_path, class: "admin-bar__button" do %>
+      <span><%= t("layouts.decidim.user_menu.admin_dashboard") %></span>
+      <%= icon "equalizer-line" %>
+    <% end %>
     <%= content_for(:extra_admin_link) if content_for?(:extra_admin_link) %>
     <%= content_for(:edit_link) if content_for?(:edit_link) %>
   </div>
-<% end %>
+</div>
diff --git a/decidim-core/app/views/layouts/decidim/_application.html.erb b/decidim-core/app/views/layouts/decidim/_application.html.erb
index c210fa4d07eba..b455607446fe0 100644
--- a/decidim-core/app/views/layouts/decidim/_application.html.erb
+++ b/decidim-core/app/views/layouts/decidim/_application.html.erb
@@ -6,7 +6,7 @@
     <%= render partial: "layouts/decidim/head" %>
   </head>
 
-  <body>
+  <body class="text-black text-md form-defaults">
     <!--noindex--><!--googleoff: all-->
     <%= cell("decidim/data_consent", current_organization) %>
     <%= render partial: "layouts/decidim/impersonation_warning" %>
@@ -16,13 +16,17 @@
     <!--googleon: all--><!--/noindex-->
 
     <%= render "layouts/decidim/wrapper" do %>
+      <%= cell "decidim/translation_bar", current_organization %>
+
       <%= yield %>
     <% end %>
 
     <%= render partial: "decidim/shared/confirm_modal" %>
     <%= render partial: "decidim/shared/login_modal" unless current_user %>
     <%= render partial: "decidim/shared/authorization_modal" %>
+    <%= render partial: "decidim/shared/share_modal" %>
     <%= render partial: "layouts/decidim/decidim_javascript" %>
     <%= render partial: "layouts/decidim/data_consent_warning" %>
+
   </body>
 </html>
diff --git a/decidim-core/app/views/layouts/decidim/_decidim_javascript.html.erb b/decidim-core/app/views/layouts/decidim/_decidim_javascript.html.erb
index 603f5b370e432..a7bf0f5f6b1b2 100644
--- a/decidim-core/app/views/layouts/decidim/_decidim_javascript.html.erb
+++ b/decidim-core/app/views/layouts/decidim/_decidim_javascript.html.erb
@@ -1,8 +1,11 @@
+<%#REDESIGN PENDING: for performance reasons defer this javacript call would be good, although there are references to jquery that need to be reviewed %>
+
 <% if Decidim.service_worker_enabled %>
-  <%= javascript_pack_tag "decidim_core", "decidim_sw", defer: false %>
+  <%= javascript_pack_tag "redesigned_decidim_core", "decidim_sw", defer: false %>
 <% else %>
-  <%= javascript_pack_tag "decidim_core", defer: false %>
+  <%= javascript_pack_tag "redesigned_decidim_core", defer: false %>
 <% end %>
+
 <%= render partial: "layouts/decidim/js_configuration" %>
 
 <%= yield :js_content %>
diff --git a/decidim-core/app/views/layouts/decidim/_head.html.erb b/decidim-core/app/views/layouts/decidim/_head.html.erb
index c4156beb43b73..7c55963d0797f 100644
--- a/decidim-core/app/views/layouts/decidim/_head.html.erb
+++ b/decidim-core/app/views/layouts/decidim/_head.html.erb
@@ -17,7 +17,7 @@
 <meta property="og:description" content="<%= decidim_meta_description %>">
 <meta property="og:image" content="<%= decidim_meta_image_url %>">
 
-<% if current_organization.colors["theme"] %>
+<% if current_organization.colors.present? %>
   <meta name="theme-color" content="<%= current_organization.colors["theme"] %>">
 <% end %>
 
@@ -26,8 +26,10 @@
 <%= apple_favicon %>
 <link rel="manifest" href="/manifest.webmanifest">
 
-<%= prepend_javascript_pack_tag "decidim_core", defer: false %>
-<%= stylesheet_pack_tag "decidim_core", media: "all" %>
+<%= prepend_javascript_pack_tag "redesigned_decidim_core", defer: false %>
+<%= stylesheet_pack_tag "redesigned_decidim_core", media: "all" %>
+<%= yield :css_content %>
+
 <%= invisible_captcha_styles %>
 <%= organization_colors %>
 
diff --git a/decidim-core/app/views/layouts/decidim/_js_configuration.html.erb b/decidim-core/app/views/layouts/decidim/_js_configuration.html.erb
index 483b909ce6fa6..b28aebaf26d3a 100644
--- a/decidim-core/app/views/layouts/decidim/_js_configuration.html.erb
+++ b/decidim-core/app/views/layouts/decidim/_js_configuration.html.erb
@@ -1,6 +1,6 @@
 <%
 js_configs = {
-  icons_path: Decidim.cors_enabled ? "" : asset_pack_path("media/images/icons.svg"),
+  icons_path: Decidim.cors_enabled ? "" : asset_pack_path("media/images/remixicon.symbol.svg"),
   messages: {
     "selfxssWarning": I18n.t("decidim.security.selfxss_warning"),
     "mentionsModal": {
@@ -10,7 +10,8 @@ js_configs = {
     editor: I18n.t("editor")
   },
   external_domain_whitelist: [current_organization.host] + current_organization.external_domain_whitelist,
-  consent_cookie_name: Decidim.consent_cookie_name
+  consent_cookie_name: Decidim.consent_cookie_name,
+  sign_out_path: decidim.destroy_user_session_path
 }
 character_messages = {
   "charactersAtLeast": {
diff --git a/decidim-core/app/views/layouts/decidim/_redesigned_application.html.erb b/decidim-core/app/views/layouts/decidim/_redesigned_application.html.erb
deleted file mode 100644
index ce9fe33d05f56..0000000000000
--- a/decidim-core/app/views/layouts/decidim/_redesigned_application.html.erb
+++ /dev/null
@@ -1,30 +0,0 @@
-<%= render partial: "layouts/decidim/meta_tags_config" %>
-<!DOCTYPE html>
-<html lang="<%= I18n.locale %>" class="no-js">
-  <head>
-    <title><%= decidim_page_title %></title>
-    <%= render partial: "layouts/decidim/redesigned_head" %>
-  </head>
-
-  <body class="text-black text-md form-defaults">
-    <!--noindex--><!--googleoff: all-->
-    <%= cell("decidim/data_consent", current_organization) %>
-    <%= render partial: "layouts/decidim/impersonation_warning" %>
-    <%= render partial: "layouts/decidim/omnipresent_banner" %>
-    <%= render partial: "layouts/decidim/redesigned_timeout_modal" %>
-    <%= render partial: "layouts/decidim/offline_banner" %>
-    <!--googleon: all--><!--/noindex-->
-
-    <%= render "layouts/decidim/redesigned_wrapper" do %>
-      <%= yield %>
-    <% end %>
-
-    <%= render partial: redesign_enabled? ? "decidim/shared/redesigned_confirm_modal" : "decidim/shared/confirm_modal" %>
-    <%= render partial: "decidim/shared/redesigned_login_modal" unless current_user %>
-    <%= render partial: "decidim/shared/redesigned_authorization_modal" %>
-    <%= render partial: "decidim/shared/redesigned_share_modal" %>
-    <%= render partial: "layouts/decidim/redesigned_decidim_javascript" %>
-    <%= render partial: "layouts/decidim/data_consent_warning" %>
-
-  </body>
-</html>
diff --git a/decidim-core/app/views/layouts/decidim/_redesigned_decidim_javascript.html.erb b/decidim-core/app/views/layouts/decidim/_redesigned_decidim_javascript.html.erb
deleted file mode 100644
index 71d0b2f283d47..0000000000000
--- a/decidim-core/app/views/layouts/decidim/_redesigned_decidim_javascript.html.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<%#REDESIGN PENDING: for performance reasons defer this javacript call would be good, although there are references to jquery that need to be reviewed %>
-
-<% if Decidim.service_worker_enabled %>
-  <%= javascript_pack_tag "redesigned_decidim_core", "decidim_sw", defer: false %>
-<% else %>
-  <%= javascript_pack_tag "redesigned_decidim_core", defer: false %>
-<% end %>
-
-<%= render partial: "layouts/decidim/redesigned_js_configuration" %>
-
-<%= yield :js_content %>
-
-<%= snippets.display(:foot) %>
-
-<%= render partial: "layouts/decidim/cors" if Decidim.cors_enabled %>
diff --git a/decidim-core/app/views/layouts/decidim/_redesigned_head.html.erb b/decidim-core/app/views/layouts/decidim/_redesigned_head.html.erb
deleted file mode 100644
index 7c55963d0797f..0000000000000
--- a/decidim-core/app/views/layouts/decidim/_redesigned_head.html.erb
+++ /dev/null
@@ -1,39 +0,0 @@
-<%= csrf_meta_tags %>
-
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<% available_locales.each do |locale| %>
-  <link rel="alternate" href="<%= url_for(request.parameters.merge(locale:)) %>" hreflang="<%= locale %>">
-<% end %>
-
-<meta name="twitter:card" content="summary_large_image">
-<meta name="twitter:site" content="@<%= decidim_meta_twitter_handler %>">
-<meta name="twitter:title" content="<%= decidim_page_title %>">
-<meta name="twitter:description" content="<%= decidim_meta_description %>">
-<meta name="twitter:image" content="<%= decidim_meta_image_url %>">
-
-<meta property="og:url" content="<%= decidim_meta_url %>">
-<meta property="og:type" content="article">
-<meta property="og:title" content="<%= decidim_page_title %>">
-<meta property="og:description" content="<%= decidim_meta_description %>">
-<meta property="og:image" content="<%= decidim_meta_image_url %>">
-
-<% if current_organization.colors.present? %>
-  <meta name="theme-color" content="<%= current_organization.colors["theme"] %>">
-<% end %>
-
-<%= legacy_favicon %>
-<%= favicon %>
-<%= apple_favicon %>
-<link rel="manifest" href="/manifest.webmanifest">
-
-<%= prepend_javascript_pack_tag "redesigned_decidim_core", defer: false %>
-<%= stylesheet_pack_tag "redesigned_decidim_core", media: "all" %>
-<%= yield :css_content %>
-
-<%= invisible_captcha_styles %>
-<%= organization_colors %>
-
-<%= render partial: "layouts/decidim/head_extra" %>
-<%== current_organization.header_snippets if Decidim.enable_html_header_snippets %>
-<%= snippets.display(:head) %>
-<%= content_for :header_snippets %>
diff --git a/decidim-core/app/views/layouts/decidim/_redesigned_js_configuration.html.erb b/decidim-core/app/views/layouts/decidim/_redesigned_js_configuration.html.erb
deleted file mode 100644
index b28aebaf26d3a..0000000000000
--- a/decidim-core/app/views/layouts/decidim/_redesigned_js_configuration.html.erb
+++ /dev/null
@@ -1,39 +0,0 @@
-<%
-js_configs = {
-  icons_path: Decidim.cors_enabled ? "" : asset_pack_path("media/images/remixicon.symbol.svg"),
-  messages: {
-    "selfxssWarning": I18n.t("decidim.security.selfxss_warning"),
-    "mentionsModal": {
-      "removeRecipient": t("decidim.shared.mentions_modal.remove_recipient", name: "%name%")
-    },
-    emojis: I18n.t("emojis").deep_transform_keys { |k| k.to_s.camelize(:lower) },
-    editor: I18n.t("editor")
-  },
-  external_domain_whitelist: [current_organization.host] + current_organization.external_domain_whitelist,
-  consent_cookie_name: Decidim.consent_cookie_name,
-  sign_out_path: decidim.destroy_user_session_path
-}
-character_messages = {
-  "charactersAtLeast": {
-    one: t("forms.length_validator.minimum.one", count: "%count%", default: "forms.length_validator.minimum.other"),
-    other: t("forms.length_validator.minimum.other", count: "%count%")
-  },
-  "charactersLeft": {
-    one: t("decidim.components.add_comment_form.remaining_characters_1", count: "%count%"),
-    other: t("decidim.components.add_comment_form.remaining_characters", count: "%count%")
-  }
-}
-external_link_messages = {
-  "externalLink": t("decidim.accessibility.external_link")
-}
-validator_messages = {
-  "correctErrors": t("forms.correct_errors")
-}
-%>
-
-<script>
-  Decidim.config.set(<%== js_configs.to_json %>);
-  Decidim.InputCharacterCounter.configureMessages(<%== character_messages.to_json %>);
-  Decidim.ExternalLink.configureMessages(<%== external_link_messages.to_json %>);
-  Decidim.FormValidator.configureMessages(<%== validator_messages.to_json %>);
-</script>
diff --git a/decidim-core/app/views/layouts/decidim/_redesigned_timeout_modal.html.erb b/decidim-core/app/views/layouts/decidim/_redesigned_timeout_modal.html.erb
deleted file mode 100644
index 8711fa781598a..0000000000000
--- a/decidim-core/app/views/layouts/decidim/_redesigned_timeout_modal.html.erb
+++ /dev/null
@@ -1,32 +0,0 @@
-<% if current_user && !current_user.remember_created_at %>
-  <% timeout_time_seconds = Decidim.config.expire_session_after.to_i %>
-  <% prevent_timeout_for = try(:prevent_timeout_seconds) || 0 %>
-
-  <%= decidim_modal id: "timeoutModal", data: {
-        "seconds-until-timeout-path": decidim.seconds_until_timeout_path,
-        "heartbeat-path": decidim.heartbeat_path,
-        "session-timeout": timeout_time_seconds,
-        "prevent-timeout-seconds": prevent_timeout_for,
-        "session-timeout-interval": Decidim.config.session_timeout_interval.to_i * 1000
-      } do %>
-    <div data-dialog-container>
-      <%= icon "timer-line" %>
-      <h3 id="dialog-title-timeoutModal" data-dialog-title><%= t("title", scope: "layouts.decidim.timeout_modal") %></h3>
-      <div>
-        <p id="dialog-desc-timeoutModal"><%= t("body", scope: "layouts.decidim.timeout_modal", minutes: (timeout_time_seconds / 60) - 2) %></p>
-      </div>
-    </div>
-
-    <div data-dialog-actions>
-      <%= link_to t("sign_out", scope: "layouts.decidim.timeout_modal"), decidim.destroy_user_session_path, method: :delete, class: "button button__sm md:button__lg button__transparent-secondary" %>
-      <%= link_to "", decidim.destroy_user_session_path(translation_suffix: :timed_out), method: :delete, id: "reveal-hidden-sign-out", class: "hidden" %>
-
-      <%= button_to t("continue_session", scope: "layouts.decidim.timeout_modal"),
-        decidim.heartbeat_path,
-        id: "continueSession",
-        class: "button button__sm md:button__lg button__secondary",
-        remote: true,
-        method: :post %>
-    </div>
-  <% end %>
-<% end %>
diff --git a/decidim-core/app/views/layouts/decidim/_redesigned_wrapper.html.erb b/decidim-core/app/views/layouts/decidim/_redesigned_wrapper.html.erb
deleted file mode 100644
index f6d2b7e34cca0..0000000000000
--- a/decidim-core/app/views/layouts/decidim/_redesigned_wrapper.html.erb
+++ /dev/null
@@ -1,35 +0,0 @@
-<%
-if respond_to?(:current_component) && current_component && can_be_managed?(current_component)
-  edit_link(
-    manage_component_path(current_component),
-    :read,
-    :component,
-    component: current_component,
-    current_participatory_space:
-  )
-end
-%>
-
-<div class="layout-container">
-  <header>
-    <%= link_to t("skip_button", scope: "decidim.accessibility"), url_for(anchor: "content"), class: "layout-container__skip" %>
-    <%= render partial: "layouts/decidim/admin_links" if current_user&.admin %>
-    <%= render partial: "layouts/decidim/header/redesigned_main" %>
-    <%= render partial: "layouts/decidim/header/redesigned_menu" unless controller_name == "homepage" %>
-  </header>
-
-  <% if display_flash_messages.present? %>
-    <div class="container">
-      <%= display_flash_messages %>
-    </div>
-  <% end %>
-
-  <div id="content" data-content>
-    <%= yield %>
-  </div>
-
-  <footer>
-    <%= render partial: "layouts/decidim/footer/redesigned_main" %>
-    <%= render partial: "layouts/decidim/footer/redesigned_mini" %>
-  </footer>
-</div>
diff --git a/decidim-core/app/views/layouts/decidim/_redesinged_decidim_javascript.html.erb b/decidim-core/app/views/layouts/decidim/_redesinged_decidim_javascript.html.erb
index f6dedadafe202..e441facaba177 100644
--- a/decidim-core/app/views/layouts/decidim/_redesinged_decidim_javascript.html.erb
+++ b/decidim-core/app/views/layouts/decidim/_redesinged_decidim_javascript.html.erb
@@ -6,7 +6,7 @@
   <%= javascript_pack_tag "redesigned_decidim_core", defer: false %>
 <% end %>
 
-<%= render partial: "layouts/decidim/redesigned_js_configuration" %>
+<%= render partial: "layouts/decidim/js_configuration" %>
 
 <%= yield :js_content %>
 
diff --git a/decidim-core/app/views/layouts/decidim/_timeout_modal.html.erb b/decidim-core/app/views/layouts/decidim/_timeout_modal.html.erb
index 95f0f1c9132c0..8711fa781598a 100644
--- a/decidim-core/app/views/layouts/decidim/_timeout_modal.html.erb
+++ b/decidim-core/app/views/layouts/decidim/_timeout_modal.html.erb
@@ -1,24 +1,32 @@
 <% if current_user && !current_user.remember_created_at %>
   <% timeout_time_seconds = Decidim.config.expire_session_after.to_i %>
   <% prevent_timeout_for = try(:prevent_timeout_seconds) || 0 %>
-  <div class="reveal" id="timeoutModal" data-close-on-click="false" data-close-on-esc="false"
-    data-seconds-until-timeout-path="<%= decidim.seconds_until_timeout_path %>"
-    data-heartbeat-path="<%= decidim.heartbeat_path %>"
-    data-session-timeout="<%= timeout_time_seconds %>"
-    data-prevent-timeout-seconds="<%= prevent_timeout_for %>"
-    data-session-timeout-interval="<%= Decidim.config.session_timeout_interval.to_i * 1000 %>" data-reveal>
-    <h2><%= t(".title") %></h2>
-    <p><%= t(".body", minutes: (timeout_time_seconds / 60) - 2) %></p>
 
-    <div class="reveal__buttons">
-      <%= link_to t(".sign_out"), decidim.destroy_user_session_path, method: :delete, class: "button warning" %>
-      <%= link_to "", decidim.destroy_user_session_path(translation_suffix: :timed_out), method: :delete, id: "reveal-hidden-sign-out", class: "hide" %>
-      <%= button_to t(".continue_session"),
+  <%= decidim_modal id: "timeoutModal", data: {
+        "seconds-until-timeout-path": decidim.seconds_until_timeout_path,
+        "heartbeat-path": decidim.heartbeat_path,
+        "session-timeout": timeout_time_seconds,
+        "prevent-timeout-seconds": prevent_timeout_for,
+        "session-timeout-interval": Decidim.config.session_timeout_interval.to_i * 1000
+      } do %>
+    <div data-dialog-container>
+      <%= icon "timer-line" %>
+      <h3 id="dialog-title-timeoutModal" data-dialog-title><%= t("title", scope: "layouts.decidim.timeout_modal") %></h3>
+      <div>
+        <p id="dialog-desc-timeoutModal"><%= t("body", scope: "layouts.decidim.timeout_modal", minutes: (timeout_time_seconds / 60) - 2) %></p>
+      </div>
+    </div>
+
+    <div data-dialog-actions>
+      <%= link_to t("sign_out", scope: "layouts.decidim.timeout_modal"), decidim.destroy_user_session_path, method: :delete, class: "button button__sm md:button__lg button__transparent-secondary" %>
+      <%= link_to "", decidim.destroy_user_session_path(translation_suffix: :timed_out), method: :delete, id: "reveal-hidden-sign-out", class: "hidden" %>
+
+      <%= button_to t("continue_session", scope: "layouts.decidim.timeout_modal"),
         decidim.heartbeat_path,
         id: "continueSession",
-        class: "button primary",
+        class: "button button__sm md:button__lg button__secondary",
         remote: true,
         method: :post %>
     </div>
-  </div>
+  <% end %>
 <% end %>
diff --git a/decidim-core/app/views/layouts/decidim/_wrapper.html.erb b/decidim-core/app/views/layouts/decidim/_wrapper.html.erb
index 96c290323793c..1187bb443866c 100644
--- a/decidim-core/app/views/layouts/decidim/_wrapper.html.erb
+++ b/decidim-core/app/views/layouts/decidim/_wrapper.html.erb
@@ -10,108 +10,26 @@ if respond_to?(:current_component) && current_component && can_be_managed?(curre
 end
 %>
 
-<!-- REDESIGN_PENDING: Remove when redesigned is finished -->
-<div class="off-canvas-wrapper">
-  <div class="off-canvas-wrapper-inner" data-off-canvas-wrapper>
-    <div class="off-canvas position-right hide-for-large" data-position="right"
-         id="offCanvas" data-off-canvas>
-      <!-- Close button -->
-      <button class="close-button"
-              aria-label="<%= t("layouts.decidim.header.close_menu") %>" type="button"
-              data-close>
-        <span aria-hidden="true">&times;</span>
-      </button>
-      <!-- Menu -->
-      <div class="hide-for-medium" data-set="nav-holder"></div>
-      <div class="hide-for-medium usermenu-off-canvas-holder"
-           data-set="nav-login-holder"></div>
-      <div class="hide-for-medium mt-s ml-s mr-s search-off-canvas-holder"
-           data-set="nav-search-holder"></div>
-    </div>
-    <div class="off-canvas-content" data-off-canvas-content>
-      <div class="footer-separator">
-        <!--separates the footer from the rest of the page,
-             creates a sticky footer-->
-        <div class="header" role="banner">
-          <!-- Topbar -->
-          <div class="title-bar">
-            <%= link_to t("skip_button", scope: "decidim.accessibility"), url_for(anchor: "content"), class: "skip" %>
-            <% if current_organization.official_img_header.attached? %>
-              <%= link_to current_organization.official_url, class: "logo-cityhall" do %>
-                <%= image_tag current_organization.attached_uploader(:official_img_header).path, alt: current_organization.name %>
-              <% end %>
-            <% end %>
-            <div class="row column topbar">
-              <div class="logo-wrapper">
-                <%= render partial: "layouts/decidim/logo", locals: { organization: current_organization } %>
-              </div>
-              <%= render partial: "layouts/decidim/topbar_search" %>
-              <%= render partial: "layouts/decidim/language_chooser" %>
-              <div class="hide-for-medium topbar__menu">
-                <button type="button" data-toggle="offCanvas" aria-label="<%= t("layouts.decidim.header.navigation") %>">
-                  <%= icon "menu", aria_label: t("layouts.decidim.header.navigation"), role: "img" %>
-                </button>
-              </div>
-              <% if current_user %>
-                <nav class="topbar__dropmenu topbar__user__logged" aria-label="<%= t("layouts.decidim.header.user_menu") %>">
-                  <%= link_to decidim.notifications_path, class: "topbar__notifications #{current_user.notifications.any? ? "is-active" : ""}" do %>
-                    <%= icon "bell", role: "img", aria_label: t("layouts.decidim.user_menu.notifications") %>
-                  <% end %>
-                  <%= link_to decidim.conversations_path, class: "topbar__conversations #{current_user.unread_conversations.any? ? "is-active" : ""}" do %>
-                    <%= icon "envelope-closed", role: "img", aria_label: t("layouts.decidim.user_menu.conversations") %>
-                  <% end %>
-                  <ul class="dropdown menu" data-dropdown-menu
-                    data-autoclose="false"
-                    data-disable-hover="true"
-                    data-click-open="true"
-                    data-close-on-click="true"
-                    role="menubar">
-                    <li class="is-dropdown-submenu-parent show-for-medium" role="presentation">
-                      <%= link_to current_user.name, decidim.account_path, id: "user-menu-control", "aria-controls": "user-menu", "aria-haspopup": "menu", "aria-label": t("layouts.decidim.user_menu.account", name: current_user.name), "role": "menuitem" %>
-                      <ul class="menu is-dropdown-submenu" id="user-menu" role="menu" aria-labelledby="user-menu-control">
-                        <%= render partial: "layouts/decidim/user_menu" %>
-                      </ul>
-                      <div data-set="nav-login-holder" class="show-for-medium">
-                        <!-- Repeated due to dropdown limitations -->
-                        <ul class="menu is-dropdown-submenu js-append usermenu-off-canvas">
-                          <%= render partial: "layouts/decidim/user_menu" %>
-                        </ul>
-                      </div>
-                    </li>
-                  </ul>
-                </nav>
-              <% else %>
-                <div class="topbar__user show-for-medium" data-set="nav-login-holder">
-                  <div class="topbar__user__login js-append">
-                    <% if current_organization.sign_up_enabled? %>
-                      <%= link_to t("layouts.decidim.header.sign_up"), decidim.new_user_registration_path, class: "sign-up-link" %>
-                    <% end %>
-                    <%= link_to t("layouts.decidim.header.sign_in"), decidim.new_user_session_path, class: "sign-in-link" %>
-                  </div>
-                </div>
-              <% end %>
-
-              <%= render partial: "layouts/decidim/admin_links" %>
-            </div>
-          </div>
-          <div class="show-for-medium" data-set="nav-holder">
-            <div class="navbar js-append">
-              <div class="row column">
-                <%= main_menu.render %>
-              </div>
-            </div>
-          </div>
-        </div>
+<div class="layout-container">
+  <header>
+    <%= link_to t("skip_button", scope: "decidim.accessibility"), url_for(anchor: "content"), class: "layout-container__skip" %>
+    <%= render partial: "layouts/decidim/admin_links" if current_user&.admin %>
+    <%= render partial: "layouts/decidim/header/main" %>
+    <%= render partial: "layouts/decidim/header/menu" unless controller_name == "homepage" %>
+  </header>
 
-        <main id="content" data-content>
-          <%= display_flash_messages %>
-          <%= yield %>
-        </main>
-      </div>
-      <div class="footer" role="contentinfo">
-        <%= render partial: "layouts/decidim/main_footer" %>
-        <%= render partial: "layouts/decidim/mini_footer" %>
-      </div>
+  <% if display_flash_messages.present? %>
+    <div class="container">
+      <%= display_flash_messages %>
     </div>
+  <% end %>
+
+  <div id="content" data-content>
+    <%= yield %>
   </div>
+
+  <footer>
+    <%= render partial: "layouts/decidim/footer/main" %>
+    <%= render partial: "layouts/decidim/footer/mini" %>
+  </footer>
 </div>
diff --git a/decidim-core/app/views/layouts/decidim/footer/_redesigned_main.html.erb b/decidim-core/app/views/layouts/decidim/footer/_main.html.erb
similarity index 59%
rename from decidim-core/app/views/layouts/decidim/footer/_redesigned_main.html.erb
rename to decidim-core/app/views/layouts/decidim/footer/_main.html.erb
index 9fd4f2e1dbdc3..4a4726b18124f 100644
--- a/decidim-core/app/views/layouts/decidim/footer/_redesigned_main.html.erb
+++ b/decidim-core/app/views/layouts/decidim/footer/_main.html.erb
@@ -1,20 +1,20 @@
 <div class="bg-gray-4">
   <div class="flex flex-col lg:flex-row gap-8 container py-10">
     <div class="lg:w-1/3">
-      <%= render partial: "layouts/decidim/footer/redesigned_main_intro" %>
+      <%= render partial: "layouts/decidim/footer/main_intro" %>
     </div>
     <div class="lg:w-2/3 grid grid-cols-1 gap-x-4 gap-y-10 lg:grid-cols-4 text-md text-white">
-      <%= render partial: "layouts/decidim/footer/redesigned_main_links" %>
+      <%= render partial: "layouts/decidim/footer/main_links" %>
     </div>
     <%= cell("decidim/footer_pages", :topics) %>
   </div>
   <div class="border-t border-black flex flex-wrap items-center gap-6 container py-6 text-white">
     <nav class="md:w-1/2 lg:w-auto" role="navigation" aria-label="Legal">
-      <%= render partial: "layouts/decidim/footer/redesigned_main_legal" %>
+      <%= render partial: "layouts/decidim/footer/main_legal" %>
     </nav>
     <nav class="max-w-fit w-full md:w-auto md:ml-auto" role="navigation" aria-label="Social media">
-      <%= render partial: "layouts/decidim/footer/redesigned_main_social_media_links" %>
+      <%= render partial: "layouts/decidim/footer/main_social_media_links" %>
     </nav>
-    <%= render partial: "layouts/decidim/footer/redesigned_main_language_chooser" %>
+    <%= render partial: "layouts/decidim/footer/main_language_chooser" %>
   </div>
 </div>
diff --git a/decidim-core/app/views/layouts/decidim/footer/_redesigned_main_intro.html.erb b/decidim-core/app/views/layouts/decidim/footer/_main_intro.html.erb
similarity index 100%
rename from decidim-core/app/views/layouts/decidim/footer/_redesigned_main_intro.html.erb
rename to decidim-core/app/views/layouts/decidim/footer/_main_intro.html.erb
diff --git a/decidim-core/app/views/layouts/decidim/footer/_redesigned_main_language_chooser.html.erb b/decidim-core/app/views/layouts/decidim/footer/_main_language_chooser.html.erb
similarity index 100%
rename from decidim-core/app/views/layouts/decidim/footer/_redesigned_main_language_chooser.html.erb
rename to decidim-core/app/views/layouts/decidim/footer/_main_language_chooser.html.erb
diff --git a/decidim-core/app/views/layouts/decidim/footer/_redesigned_main_legal.html.erb b/decidim-core/app/views/layouts/decidim/footer/_main_legal.html.erb
similarity index 100%
rename from decidim-core/app/views/layouts/decidim/footer/_redesigned_main_legal.html.erb
rename to decidim-core/app/views/layouts/decidim/footer/_main_legal.html.erb
diff --git a/decidim-core/app/views/layouts/decidim/footer/_redesigned_main_links.html.erb b/decidim-core/app/views/layouts/decidim/footer/_main_links.html.erb
similarity index 100%
rename from decidim-core/app/views/layouts/decidim/footer/_redesigned_main_links.html.erb
rename to decidim-core/app/views/layouts/decidim/footer/_main_links.html.erb
diff --git a/decidim-core/app/views/layouts/decidim/footer/_redesigned_main_social_media_links.html.erb b/decidim-core/app/views/layouts/decidim/footer/_main_social_media_links.html.erb
similarity index 100%
rename from decidim-core/app/views/layouts/decidim/footer/_redesigned_main_social_media_links.html.erb
rename to decidim-core/app/views/layouts/decidim/footer/_main_social_media_links.html.erb
diff --git a/decidim-core/app/views/layouts/decidim/footer/_redesigned_mini.html.erb b/decidim-core/app/views/layouts/decidim/footer/_mini.html.erb
similarity index 100%
rename from decidim-core/app/views/layouts/decidim/footer/_redesigned_mini.html.erb
rename to decidim-core/app/views/layouts/decidim/footer/_mini.html.erb
diff --git a/decidim-core/app/views/layouts/decidim/header/_redesigned_main.html.erb b/decidim-core/app/views/layouts/decidim/header/_main.html.erb
similarity index 61%
rename from decidim-core/app/views/layouts/decidim/header/_redesigned_main.html.erb
rename to decidim-core/app/views/layouts/decidim/header/_main.html.erb
index fd262a28af159..8fb5fc9abae56 100644
--- a/decidim-core/app/views/layouts/decidim/header/_redesigned_main.html.erb
+++ b/decidim-core/app/views/layouts/decidim/header/_main.html.erb
@@ -4,16 +4,16 @@
       <%= render partial: "layouts/decidim/logo", locals: { organization: current_organization } %>
     </div>
     <div class="main-bar__search">
-      <%= render partial: "layouts/decidim/header/redesigned_main_search" %>
+      <%= render partial: "layouts/decidim/header/main_search" %>
     </div>
     <div class="main-bar__links-desktop">
-      <%= render partial: "layouts/decidim/header/redesigned_main_links_desktop" %>
+      <%= render partial: "layouts/decidim/header/main_links_desktop" %>
     </div>
 
     <div class="lg:hidden">
       <%# Sticky menu mobile %>
       <div class="main-bar__links-mobile">
-        <%= render partial: "layouts/decidim/header/redesigned_main_links_mobile" %>
+        <%= render partial: "layouts/decidim/header/main_links_mobile" %>
       </div>
 
       <%# Main dropdown mobile %>
@@ -24,12 +24,12 @@
       </div>
 
       <div id="dropdown-menu-main-mobile" class="main-bar__links-mobile__dropdown" aria-hidden="true">
-        <%= render partial: "layouts/decidim/header/redesigned_menu_breadcrumb_main_dropdown", locals: { id: "breadcrumb-main-dropdown-mobile" } %>
+        <%= render partial: "layouts/decidim/header/menu_breadcrumb_main_dropdown", locals: { id: "breadcrumb-main-dropdown-mobile" } %>
       </div>
 
       <%# Overlay menus mobile %>
-      <%= render partial: "layouts/decidim/header/redesigned_main_links_mobile_search" %>
-      <%= render partial: "layouts/decidim/header/redesigned_main_links_mobile_account" if current_user %>
+      <%= render partial: "layouts/decidim/header/main_links_mobile_search" %>
+      <%= render partial: "layouts/decidim/header/main_links_mobile_account" if current_user %>
     </div>
   </div>
 </div>
diff --git a/decidim-core/app/views/layouts/decidim/header/_redesigned_main_links_desktop.html.erb b/decidim-core/app/views/layouts/decidim/header/_main_links_desktop.html.erb
similarity index 95%
rename from decidim-core/app/views/layouts/decidim/header/_redesigned_main_links_desktop.html.erb
rename to decidim-core/app/views/layouts/decidim/header/_main_links_desktop.html.erb
index 6102849df32a4..dd9f5d1317f0f 100644
--- a/decidim-core/app/views/layouts/decidim/header/_redesigned_main_links_desktop.html.erb
+++ b/decidim-core/app/views/layouts/decidim/header/_main_links_desktop.html.erb
@@ -47,7 +47,7 @@
     </button>
     <div id="dropdown-menu-account" aria-hidden="true">
       <ul class="dropdown dropdown__bottom main-bar__dropdown">
-        <%= render partial: "layouts/decidim/header/redesigned_main_links_dropdown", locals: { unread_data: } %>
+        <%= render partial: "layouts/decidim/header/main_links_dropdown", locals: { unread_data: } %>
       </ul>
     </div>
   </div>
diff --git a/decidim-core/app/views/layouts/decidim/header/_redesigned_main_links_dropdown.html.erb b/decidim-core/app/views/layouts/decidim/header/_main_links_dropdown.html.erb
similarity index 100%
rename from decidim-core/app/views/layouts/decidim/header/_redesigned_main_links_dropdown.html.erb
rename to decidim-core/app/views/layouts/decidim/header/_main_links_dropdown.html.erb
diff --git a/decidim-core/app/views/layouts/decidim/header/_redesigned_main_links_mobile.html.erb b/decidim-core/app/views/layouts/decidim/header/_main_links_mobile.html.erb
similarity index 100%
rename from decidim-core/app/views/layouts/decidim/header/_redesigned_main_links_mobile.html.erb
rename to decidim-core/app/views/layouts/decidim/header/_main_links_mobile.html.erb
diff --git a/decidim-core/app/views/layouts/decidim/header/_redesigned_main_links_mobile_account.html.erb b/decidim-core/app/views/layouts/decidim/header/_main_links_mobile_account.html.erb
similarity index 92%
rename from decidim-core/app/views/layouts/decidim/header/_redesigned_main_links_mobile_account.html.erb
rename to decidim-core/app/views/layouts/decidim/header/_main_links_mobile_account.html.erb
index 0f0752d206dac..5d7dfa4fd3ef2 100644
--- a/decidim-core/app/views/layouts/decidim/header/_redesigned_main_links_mobile_account.html.erb
+++ b/decidim-core/app/views/layouts/decidim/header/_main_links_mobile_account.html.erb
@@ -26,7 +26,7 @@
     <p class="h3 mt-2"><%= t("decidim.block_user_mailer.notify.hello") %>&nbsp;<%= current_user.name %></p>
 
     <ul>
-      <%= render partial: "layouts/decidim/header/redesigned_main_links_dropdown" %>
+      <%= render partial: "layouts/decidim/header/main_links_dropdown" %>
     </ul>
   </div>
 </div>
diff --git a/decidim-core/app/views/layouts/decidim/header/_redesigned_main_links_mobile_search.html.erb b/decidim-core/app/views/layouts/decidim/header/_main_links_mobile_search.html.erb
similarity index 100%
rename from decidim-core/app/views/layouts/decidim/header/_redesigned_main_links_mobile_search.html.erb
rename to decidim-core/app/views/layouts/decidim/header/_main_links_mobile_search.html.erb
diff --git a/decidim-core/app/views/layouts/decidim/header/_redesigned_main_search.html.erb b/decidim-core/app/views/layouts/decidim/header/_main_search.html.erb
similarity index 100%
rename from decidim-core/app/views/layouts/decidim/header/_redesigned_main_search.html.erb
rename to decidim-core/app/views/layouts/decidim/header/_main_search.html.erb
diff --git a/decidim-core/app/views/layouts/decidim/header/_redesigned_menu.html.erb b/decidim-core/app/views/layouts/decidim/header/_menu.html.erb
similarity index 71%
rename from decidim-core/app/views/layouts/decidim/header/_redesigned_menu.html.erb
rename to decidim-core/app/views/layouts/decidim/header/_menu.html.erb
index c797a3a7ddf88..a58f523e5548c 100644
--- a/decidim-core/app/views/layouts/decidim/header/_redesigned_menu.html.erb
+++ b/decidim-core/app/views/layouts/decidim/header/_menu.html.erb
@@ -3,7 +3,7 @@
 
     <%# secondary dropdown only desktop %>
     <div class="menu-bar__breadcrumb-desktop">
-      <%= render partial: "layouts/decidim/header/redesigned_menu_breadcrumb_desktop" %>
+      <%= render partial: "layouts/decidim/header/menu_breadcrumb_desktop" %>
     </div>
     <% if content_for?(:participatory_space_actions) %>
       <div class="menu-bar__actions">
@@ -13,7 +13,7 @@
 
     <%# secondary dropdown mobile-tablet %>
     <div class="menu-bar__breadcrumb-mobile">
-      <%= render partial: "layouts/decidim/header/redesigned_menu_breadcrumb_mobile_tablet" %>
+      <%= render partial: "layouts/decidim/header/menu_breadcrumb_mobile_tablet" %>
     </div>
 
   </div>
diff --git a/decidim-core/app/views/layouts/decidim/header/_redesigned_menu_breadcrumb_desktop.html.erb b/decidim-core/app/views/layouts/decidim/header/_menu_breadcrumb_desktop.html.erb
similarity index 74%
rename from decidim-core/app/views/layouts/decidim/header/_redesigned_menu_breadcrumb_desktop.html.erb
rename to decidim-core/app/views/layouts/decidim/header/_menu_breadcrumb_desktop.html.erb
index 32c8269994f6f..84799791fc71d 100644
--- a/decidim-core/app/views/layouts/decidim/header/_redesigned_menu_breadcrumb_desktop.html.erb
+++ b/decidim-core/app/views/layouts/decidim/header/_menu_breadcrumb_desktop.html.erb
@@ -8,7 +8,7 @@
 </div>
 
 <div id="main-dropdown-menu" class="menu-bar__breadcrumb-desktop__dropdown-content" aria-hidden="true">
-  <%= render partial: "layouts/decidim/header/redesigned_menu_breadcrumb_main_dropdown", locals: { id: "breadcrumb-main-dropdown-desktop" } %>
+  <%= render partial: "layouts/decidim/header/menu_breadcrumb_main_dropdown", locals: { id: "breadcrumb-main-dropdown-desktop" } %>
 </div>
 
-<%= render partial: "layouts/decidim/header/redesigned_menu_breadcrumb_items" %>
+<%= render partial: "layouts/decidim/header/menu_breadcrumb_items" %>
diff --git a/decidim-core/app/views/layouts/decidim/header/_redesigned_menu_breadcrumb_items.html.erb b/decidim-core/app/views/layouts/decidim/header/_menu_breadcrumb_items.html.erb
similarity index 100%
rename from decidim-core/app/views/layouts/decidim/header/_redesigned_menu_breadcrumb_items.html.erb
rename to decidim-core/app/views/layouts/decidim/header/_menu_breadcrumb_items.html.erb
diff --git a/decidim-core/app/views/layouts/decidim/header/_redesigned_menu_breadcrumb_main_dropdown.html.erb b/decidim-core/app/views/layouts/decidim/header/_menu_breadcrumb_main_dropdown.html.erb
similarity index 85%
rename from decidim-core/app/views/layouts/decidim/header/_redesigned_menu_breadcrumb_main_dropdown.html.erb
rename to decidim-core/app/views/layouts/decidim/header/_menu_breadcrumb_main_dropdown.html.erb
index ad2cebae6014c..d0e62c2dc37a5 100644
--- a/decidim-core/app/views/layouts/decidim/header/_redesigned_menu_breadcrumb_main_dropdown.html.erb
+++ b/decidim-core/app/views/layouts/decidim/header/_menu_breadcrumb_main_dropdown.html.erb
@@ -1,7 +1,7 @@
 <div id="<%= id %>" class="menu-bar__main-dropdown">
   <div class="menu-bar__main-dropdown__top">
     <div class="menu-bar__main-dropdown__top-left">
-      <%= render partial: "layouts/decidim/header/redesigned_menu_breadcrumb_main_dropdown_top_left" %>
+      <%= render partial: "layouts/decidim/header/menu_breadcrumb_main_dropdown_top_left" %>
     </div>
     <%= breadcrumb_root_menu.render %>
   </div>
diff --git a/decidim-core/app/views/layouts/decidim/header/_redesigned_menu_breadcrumb_main_dropdown_top_left.html.erb b/decidim-core/app/views/layouts/decidim/header/_menu_breadcrumb_main_dropdown_top_left.html.erb
similarity index 100%
rename from decidim-core/app/views/layouts/decidim/header/_redesigned_menu_breadcrumb_main_dropdown_top_left.html.erb
rename to decidim-core/app/views/layouts/decidim/header/_menu_breadcrumb_main_dropdown_top_left.html.erb
diff --git a/decidim-core/app/views/layouts/decidim/header/_redesigned_menu_breadcrumb_mobile_tablet.html.erb b/decidim-core/app/views/layouts/decidim/header/_menu_breadcrumb_mobile_tablet.html.erb
similarity index 100%
rename from decidim-core/app/views/layouts/decidim/header/_redesigned_menu_breadcrumb_mobile_tablet.html.erb
rename to decidim-core/app/views/layouts/decidim/header/_menu_breadcrumb_mobile_tablet.html.erb
diff --git a/decidim-core/app/views/layouts/decidim/redesigned_application.html.erb b/decidim-core/app/views/layouts/decidim/redesigned_application.html.erb
deleted file mode 100644
index 10a2571d3674a..0000000000000
--- a/decidim-core/app/views/layouts/decidim/redesigned_application.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= render "layouts/decidim/redesigned_application" do %>
-  <%= yield %>
-<% end %>
diff --git a/decidim-core/app/views/layouts/decidim/redesigned_newsletter_base.html.erb b/decidim-core/app/views/layouts/decidim/redesigned_newsletter_base.html.erb
deleted file mode 100644
index 096bcd11fa406..0000000000000
--- a/decidim-core/app/views/layouts/decidim/redesigned_newsletter_base.html.erb
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <meta name="viewport" content="width=device-width">
-    <%= stylesheet_pack_tag "decidim_email" %>
-  </head>
-
-  <%= content_tag :body, class: @preview ? "preview" : nil do %>
-    <!-- <style> -->
-    <table class="body">
-      <% if content_for?(:see_on_website) %>
-        <table class="container">
-          <th class="small-12 first columns headnote float-right">
-            <%= yield(:see_on_website) %>
-          </th>
-        </table>
-      <% end %>
-      <tr>
-        <td class="float-center" align="center" valign="top">
-          <center>
-            <%= yield %>
-
-            <% if content_for?(:note) or content_for?(:unsubscribe) %>
-              <table class="container">
-                <tr>
-                  <td>
-                    <table class="row">
-                      <th class="expander"></th>
-                      <th class="small-12 first last columns footnote">
-                        <center>
-                          <%= yield(:note) if content_for?(:note) %>
-                          <%= yield(:unsubscribe) if content_for?(:unsubscribe) %>
-                        </center>
-                      </th>
-                    </table>
-                  </td>
-                </tr>
-              </table>
-            <% end %>
-          </center>
-        </td>
-      </tr>
-    </table>
-  <% end %>
-</html>
diff --git a/decidim-core/app/views/layouts/decidim/redesigned_user_profile.html.erb b/decidim-core/app/views/layouts/decidim/redesigned_user_profile.html.erb
deleted file mode 100644
index 10a2571d3674a..0000000000000
--- a/decidim-core/app/views/layouts/decidim/redesigned_user_profile.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= render "layouts/decidim/redesigned_application" do %>
-  <%= yield %>
-<% end %>
diff --git a/decidim-core/app/views/layouts/decidim/shared/_layout_center.html.erb b/decidim-core/app/views/layouts/decidim/shared/_layout_center.html.erb
index 8385fa47ac5a0..a4719b3caee86 100644
--- a/decidim-core/app/views/layouts/decidim/shared/_layout_center.html.erb
+++ b/decidim-core/app/views/layouts/decidim/shared/_layout_center.html.erb
@@ -1,6 +1,6 @@
 <%
 main_enabled = true unless local_assigns.has_key?(:main_enabled)
-main_tag = redesign_enabled? && main_enabled ? :main : :div
+main_tag = main_enabled ? :main : :div
 columns ||= 6
 # Class names need to be complete, not metaprogarmmed, because of Tailwind class purge
 css_class = case columns
diff --git a/decidim-core/app/views/layouts/decidim/shared/_layout_two_col.html.erb b/decidim-core/app/views/layouts/decidim/shared/_layout_two_col.html.erb
index 8087797dcdf90..f323a32f680fb 100644
--- a/decidim-core/app/views/layouts/decidim/shared/_layout_two_col.html.erb
+++ b/decidim-core/app/views/layouts/decidim/shared/_layout_two_col.html.erb
@@ -4,7 +4,7 @@
   <aside class="layout-2col__aside">
     <%= yield :aside %>
   </aside>
-  <% main_tag = redesign_enabled? && main_enabled ? :main : :div %>
+  <% main_tag = main_enabled ? :main : :div %>
   <%= content_tag main_tag, class: "layout-2col__main" do %>
     <%= content_for :flash_messages %>
     <%= yield %>
diff --git a/decidim-core/app/views/layouts/decidim/user_profile.html.erb b/decidim-core/app/views/layouts/decidim/user_profile.html.erb
index 1e81c398730d6..4b71e3fd76eb1 100644
--- a/decidim-core/app/views/layouts/decidim/user_profile.html.erb
+++ b/decidim-core/app/views/layouts/decidim/user_profile.html.erb
@@ -1,36 +1,3 @@
-<%# REDESIGN_PENDING: file deprecated. It is not renamed due to the redesigned has been moved %>
-
-<% subtitle = content_for(:subtitle) %>
-
 <%= render "layouts/decidim/application" do %>
-  <div class="wrapper">
-    <div class="row collapse">
-      <div class="columns">
-        <h1 class="heading1 user-header">
-          <%= t("title", scope: "layouts.decidim.user_profile") %>
-          <%= " - #{subtitle}" if subtitle.present? %>
-        </h1>
-      </div>
-    </div>
-    <div class="row collapse">
-      <div class="main-container">
-        <div class="row collapse main-container--side-panel">
-          <div class="columns medium-4 large-3">
-            <div class="side-panel">
-              <ul class="tabs vertical side-panel__tabs" id="user-settings-tabs">
-                <%= user_menu.render %>
-              </ul>
-            </div>
-          </div>
-          <div class="columns medium-8 large-9">
-            <div class="main-container__content">
-              <div class="tabs-content vertical" aria-hidden="false">
-                <%= yield %>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
+  <%= yield %>
 <% end %>
diff --git a/decidim-core/config/locales/en.yml b/decidim-core/config/locales/en.yml
index 15d94bfb8d605..b3a4b71cc8926 100644
--- a/decidim-core/config/locales/en.yml
+++ b/decidim-core/config/locales/en.yml
@@ -416,7 +416,6 @@ en:
       started_at: Started at %{timestamp}
     authorization_modals:
       content:
-        close_modal: Close modal
         expired:
           authorize: Reauthorize with "%{authorization}"
           explanation: Your authorization has expired. In order to perform this action, you need to be reauthorized with "%{authorization}".
@@ -1488,12 +1487,10 @@ en:
         spam: Contains clickbait, advertising, scams or script bots.
         title: Report inappropriate User
       floating_help:
-        close: Close help
         help: Help
       follow_button:
         sign_in_before_follow: Please sign in before performing this action
       login_modal:
-        close_modal: Close modal
         please_sign_in: Please sign in
         sign_up: Sign up
       mentions_modal:
@@ -1506,9 +1503,6 @@ en:
           select_an_area: Select an area
       public_participation:
         public_participation: Show my attendance publicly
-      redesigned_login_modal:
-        please_sign_in: Please sign in
-        sign_up: Sign up
       reference:
         reference: 'Reference: %{reference}'
       represent_user_group:
@@ -1518,7 +1512,6 @@ en:
         label: 'Results per page:'
         title: Select number of results per page
       share_modal:
-        close_window: Close window
         copy_share_link: Copy
         copy_share_link_clarification: Copy share link to clipboard
         copy_share_link_copied: Copied!
@@ -1924,11 +1917,8 @@ en:
         sign_up: Sign Up
         terms_and_conditions: Terms and Conditions
       header:
-        close_menu: Close menu
         main_menu: Main menu
-        navigation: Navigation
         sign_in: Sign In
-        sign_up: Sign Up
         user_menu: User menu
       impersonation_warning:
         close_session: Close session
diff --git a/decidim-core/lib/decidim/form_builder.rb b/decidim-core/lib/decidim/form_builder.rb
index a00fc96babe35..0ecb2a37035d1 100644
--- a/decidim-core/lib/decidim/form_builder.rb
+++ b/decidim-core/lib/decidim/form_builder.rb
@@ -471,7 +471,7 @@ def upload(attribute, options = {})
       max_file_size = options[:max_file_size] || max_file_size(object, attribute)
       button_label = options[:button_label] || choose_button_label(attribute)
       help_messages = options[:help] || upload_help(object, attribute, options)
-      redesigned = @template.try(:redesign_enabled?)
+      redesigned = @template.respond_to?(:redesign_enabled?) ? @template.redesign_enabled? : true
 
       options = {
         attribute:,
diff --git a/decidim-core/lib/decidim/redesigned_filter_form_builder.rb b/decidim-core/lib/decidim/redesigned_filter_form_builder.rb
index c468208b842bc..60218d03ba0f7 100644
--- a/decidim-core/lib/decidim/redesigned_filter_form_builder.rb
+++ b/decidim-core/lib/decidim/redesigned_filter_form_builder.rb
@@ -35,7 +35,7 @@ def collection_filter(method:, collection:, label_scope:, id:, **options)
       end
 
       @template.render(
-        "decidim/shared/filters/redesigned_#{type}",
+        "decidim/shared/filters/#{type}",
         **options.merge(
           method:,
           collection:,
diff --git a/decidim-core/lib/decidim/view_model.rb b/decidim-core/lib/decidim/view_model.rb
index 064ad4a84622b..85d6c8a6ed5ac 100644
--- a/decidim-core/lib/decidim/view_model.rb
+++ b/decidim-core/lib/decidim/view_model.rb
@@ -19,8 +19,6 @@ class ViewModel < Cell::ViewModel
 
     delegate :current_organization, to: :controller
 
-    delegate :redesigned_layout, :redesign_enabled?, to: :controller
-
     cache :show, if: :perform_caching?, expires_in: :cache_expiry_time do
       cache_hash
     end
diff --git a/decidim-core/spec/cells/decidim/activity_cell_spec.rb b/decidim-core/spec/cells/decidim/activity_cell_spec.rb
index 606f5f5fd9c27..983da9c26644f 100644
--- a/decidim-core/spec/cells/decidim/activity_cell_spec.rb
+++ b/decidim-core/spec/cells/decidim/activity_cell_spec.rb
@@ -85,10 +85,6 @@
 
     before do
       allow(controller).to receive(:current_user).and_return(nil)
-      allow(controller).to receive(:redesigned_layout).with(:cell_name).and_return(cell_name)
-      allow(controller).to receive(:redesigned_layout) do |name|
-        name
-      end
     end
 
     context "when the author is shown" do
diff --git a/decidim-core/spec/cells/decidim/user_activity_cell_spec.rb b/decidim-core/spec/cells/decidim/user_activity_cell_spec.rb
index f82c2a8273fba..99029426a5578 100644
--- a/decidim-core/spec/cells/decidim/user_activity_cell_spec.rb
+++ b/decidim-core/spec/cells/decidim/user_activity_cell_spec.rb
@@ -65,13 +65,8 @@
   end
   let(:controller) { double }
 
-  def redesigned_layout(name)
-    name
-  end
-
   before do
     allow(controller).to receive(:current_organization).and_return(component.organization)
-    allow(controller).to receive(:redesign_enabled?).and_return(true)
     allow(controller).to receive(:params).and_return(ActionController::Parameters.new({}))
 
     allow(my_cell).to receive(:url_for).and_return("/")
diff --git a/decidim-core/spec/helpers/decidim/action_authorization_helper_spec.rb b/decidim-core/spec/helpers/decidim/action_authorization_helper_spec.rb
index 9296d0fa96893..f7bf261818da7 100644
--- a/decidim-core/spec/helpers/decidim/action_authorization_helper_spec.rb
+++ b/decidim-core/spec/helpers/decidim/action_authorization_helper_spec.rb
@@ -7,7 +7,6 @@ module Decidim
     let(:component) { create(:component) }
     let(:resource) { nil }
     let(:permissions_holder) { nil }
-    let(:redesign_enabled) { false }
     let(:user) { create(:user) }
     let(:action) { "foo" }
     let(:status) { double(ok?: authorized) }
@@ -20,9 +19,6 @@ module Decidim
       allow(helper).to receive(:current_component).and_return(component)
       allow(helper).to receive(:current_user).and_return(user)
       allow(helper).to receive(:action_authorized_to).with(action, resource:, permissions_holder:).and_return(status)
-      # rubocop:disable RSpec/AnyInstance
-      allow_any_instance_of(ActionView::Base).to receive(:redesign_enabled?).and_return(redesign_enabled)
-      # rubocop:enable RSpec/AnyInstance
     end
 
     shared_examples "an action authorization widget helper" do |params|
@@ -32,8 +28,8 @@ module Decidim
 
           it "renders a widget toggling the authorization modal" do
             expect(subject).not_to include(path)
-            expect(subject).to include('data-open="authorizationModal"')
-            expect(subject).to include("data-open-url=\"/authorization_modals/#{action}/f/#{component.id}\"")
+            expect(subject).to include('data-dialog-open="authorizationModal"')
+            expect(subject).to include("data-dialog-remote-url=\"/authorization_modals/#{action}/f/#{component.id}\"")
             expect(subject).to include(*params[:widget_parts])
           end
 
@@ -42,8 +38,8 @@ module Decidim
 
             it "renders a widget toggling the authorization modal" do
               expect(subject).not_to include(path)
-              expect(subject).to include('data-open="authorizationModal"')
-              expect(subject).to include("data-open-url=\"/authorization_modals/#{action}/f/#{component.id}/#{resource.resource_manifest.name}/#{resource.id}\"")
+              expect(subject).to include('data-dialog-open="authorizationModal"')
+              expect(subject).to include("data-dialog-remote-url=\"/authorization_modals/#{action}/f/#{component.id}/#{resource.resource_manifest.name}/#{resource.id}\"")
               expect(subject).to include(*params[:widget_parts])
             end
           end
@@ -55,8 +51,8 @@ module Decidim
 
             it "renders a widget toggling the authorization modal of free resources not related with a component" do
               expect(subject).not_to include(path)
-              expect(subject).to include('data-open="authorizationModal"')
-              expect(subject).to include("data-open-url=\"/free_resource_authorization_modals/#{action}/f/#{resource.resource_manifest.name}/#{resource.id}\"")
+              expect(subject).to include('data-dialog-open="authorizationModal"')
+              expect(subject).to include("data-dialog-remote-url=\"/free_resource_authorization_modals/#{action}/f/#{resource.resource_manifest.name}/#{resource.id}\"")
               expect(subject).to include(*params[:widget_parts])
             end
           end
@@ -68,7 +64,7 @@ module Decidim
 
       context "when #{params[:has_action] ? "the action is authorized" : "the user is logged"}" do
         it "renders a regular widget" do
-          expect(subject).not_to include("data-open")
+          expect(subject).not_to include("data-dialog-open")
           expect(subject).to include(path)
           expect(subject).to include(*params[:widget_parts])
         end
@@ -79,7 +75,7 @@ module Decidim
 
         it "renders a widget toggling the login modal" do
           expect(subject).not_to include(path)
-          expect(subject).to include('data-open="loginModal"')
+          expect(subject).to include('data-dialog-open="loginModal"')
           expect(subject).to include(*params[:widget_parts])
         end
       end
diff --git a/decidim-core/spec/helpers/decidim/check_boxes_tree_helper_spec.rb b/decidim-core/spec/helpers/decidim/check_boxes_tree_helper_spec.rb
index b8ebaacc5f033..de50c9fc177cc 100644
--- a/decidim-core/spec/helpers/decidim/check_boxes_tree_helper_spec.rb
+++ b/decidim-core/spec/helpers/decidim/check_boxes_tree_helper_spec.rb
@@ -14,13 +14,11 @@ module Decidim
     let!(:organization) { create(:organization) }
     let!(:participatory_space) { create(:participatory_process, organization:) }
     let!(:component) { create(:component, participatory_space:) }
-    let(:redesign_enabled) { false }
 
     before do
       allow(helper).to receive(:current_participatory_space).and_return(participatory_space)
       allow(helper).to receive(:current_component).and_return(component)
       allow(helper).to receive(:current_organization).and_return(organization)
-      allow(helper).to receive(:redesign_enabled?).and_return(redesign_enabled)
     end
 
     describe "#filter_scopes_values" do
diff --git a/decidim-core/spec/helpers/decidim/decidim_form_helper_spec.rb b/decidim-core/spec/helpers/decidim/decidim_form_helper_spec.rb
index 368d2779e0216..1b3386b29dbb5 100644
--- a/decidim-core/spec/helpers/decidim/decidim_form_helper_spec.rb
+++ b/decidim-core/spec/helpers/decidim/decidim_form_helper_spec.rb
@@ -4,14 +4,6 @@
 
 module Decidim
   describe DecidimFormHelper, type: :helper do
-    let(:redesign_enabled) { false }
-
-    before do
-      # rubocop:disable RSpec/AnyInstance
-      allow_any_instance_of(ActionView::Base).to receive(:redesign_enabled?).and_return(redesign_enabled)
-      # rubocop:enable RSpec/AnyInstance
-    end
-
     describe "decidim_form_for" do
       it "injects custom options" do
         record = double("record").as_null_object
diff --git a/decidim-core/spec/helpers/decidim/endorsable_helper_spec.rb b/decidim-core/spec/helpers/decidim/endorsable_helper_spec.rb
index 232758ac09bad..35749856dd8b1 100644
--- a/decidim-core/spec/helpers/decidim/endorsable_helper_spec.rb
+++ b/decidim-core/spec/helpers/decidim/endorsable_helper_spec.rb
@@ -52,16 +52,11 @@ module Decidim
       let(:resource) { create(:dummy_resource, component:) }
       let(:user) { create(:user, :confirmed, organization:) }
       let(:user_group) { nil }
-      let(:redesign_enabled) { false }
 
       before do
         allow(helper).to receive(:endorsements_path).and_return(Decidim::Core::Engine.routes.url_helpers.endorsements_path(id: resource))
         allow(helper).to receive(:endorsement_path).and_return(Decidim::Core::Engine.routes.url_helpers.endorsement_path(id: resource))
         allow(controller).to receive(:current_user).and_return(user)
-        allow(controller).to receive(:redesign_enabled?).and_return(redesign_enabled)
-        # rubocop:disable RSpec/AnyInstance
-        allow_any_instance_of(ActionView::Base).to receive(:redesign_enabled?).and_return(redesign_enabled)
-        # rubocop:enable RSpec/AnyInstance
       end
 
       context "when it is a user" do
diff --git a/decidim-core/spec/helpers/decidim/icon_helper_spec.rb b/decidim-core/spec/helpers/decidim/icon_helper_spec.rb
index f530b1534b5c0..a30c7edbf3239 100644
--- a/decidim-core/spec/helpers/decidim/icon_helper_spec.rb
+++ b/decidim-core/spec/helpers/decidim/icon_helper_spec.rb
@@ -5,17 +5,10 @@
 module Decidim
   describe IconHelper do
     describe "#component_icon" do
-      let(:redesign_enabled) { false }
       let(:component) do
         create(:component, manifest_name: :dummy)
       end
 
-      before do
-        # rubocop:disable RSpec/AnyInstance
-        allow_any_instance_of(ActionView::Base).to receive(:redesign_enabled?).and_return(redesign_enabled)
-        # rubocop:enable RSpec/AnyInstance
-      end
-
       describe "when the component has no icon" do
         before do
           allow(component.manifest).to receive(:icon).and_return(nil)
@@ -81,7 +74,7 @@ module Decidim
           let(:resource) { build(:user) }
 
           it "renders a person icon" do
-            expect(result).to include("svg#icon-person")
+            expect(result).to include("svg#ri-person")
           end
         end
 
@@ -93,7 +86,7 @@ module Decidim
           end
 
           it "renders a generic icon" do
-            expect(result).to include("svg#icon-bell")
+            expect(result).to include("svg#ri-bell")
           end
         end
 
@@ -105,7 +98,7 @@ module Decidim
           end
 
           it "renders a generic icon" do
-            expect(result).to include("svg#icon-question-mark")
+            expect(result).to include("svg#ri-question-mark")
           end
         end
 
@@ -113,7 +106,7 @@ module Decidim
           let(:resource) { "Something" }
 
           it "renders a generic icon" do
-            expect(result).to include("svg#icon-bell")
+            expect(result).to include("svg#ri-bell")
           end
         end
       end
diff --git a/decidim-core/spec/helpers/decidim/social_share_button_helper_spec.rb b/decidim-core/spec/helpers/decidim/social_share_button_helper_spec.rb
index 7f4b804147a57..c7b92ab11ed7a 100644
--- a/decidim-core/spec/helpers/decidim/social_share_button_helper_spec.rb
+++ b/decidim-core/spec/helpers/decidim/social_share_button_helper_spec.rb
@@ -6,17 +6,10 @@ module Decidim
   describe SocialShareButtonHelper do
     let(:args) { { url: "http://example.org" } }
     let(:result) { helper.social_share_button_tag("Hello", **args) }
-    let(:redesign_enabled) { false }
-
-    before do
-      # rubocop:disable RSpec/AnyInstance
-      allow_any_instance_of(ActionView::Base).to receive(:redesign_enabled?).and_return(redesign_enabled)
-      # rubocop:enable RSpec/AnyInstance
-    end
 
     describe "social_share_button_tag" do
       it "renders the class" do
-        expect(result).to include(redesign_enabled ? "data-social-share" : "social-share-button")
+        expect(result).to include("data-social-share")
       end
     end
 
@@ -90,7 +83,7 @@ module Decidim
           let(:args) { { hashtags: "Hello" } }
 
           it "renders the correct HTML" do
-            expect(result).to eq(redesign_enabled ? %(<div class="share-modal__list" data-social-share=""></div>) : %(<div class="social-share-button"></div>))
+            expect(result).to eq(%(<div class="share-modal__list" data-social-share=""></div>))
           end
         end
       end
diff --git a/decidim-core/spec/lib/form_builder_spec.rb b/decidim-core/spec/lib/form_builder_spec.rb
index 5522ead3598e1..a0bc3fb72888b 100644
--- a/decidim-core/spec/lib/form_builder_spec.rb
+++ b/decidim-core/spec/lib/form_builder_spec.rb
@@ -9,7 +9,6 @@ module Decidim
     let(:available_locales) { %w(ca en de-CH) }
     let(:uploader) { Decidim::ApplicationUploader }
     let(:organization) { create(:organization) }
-    let(:redesign_enabled?) { false }
 
     let(:resource) do
       class DummyClass
@@ -80,7 +79,6 @@ def organization
     before do
       allow(Decidim).to receive(:available_locales).and_return available_locales
       allow(I18n.config).to receive(:enforce_available_locales).and_return(false)
-      allow(helper).to receive(:redesign_enabled?).and_return(redesign_enabled?)
     end
 
     describe "#editor" do
@@ -788,14 +786,14 @@ def organization
 
           it "renders the correctly sorted values" do
             html = output
-            expect(html).to include(
-              [
-                "<li>This image will be resized and padded to 33 x 33 px.</li>",
-                "<li>This image will be resized and padded to 99 x 99 px.</li>",
-                "<li>This image will be resized to fit 32 x 32 px.</li>",
-                "<li>This image will be resized to fit 100 x 100 px.</li>"
-              ].join("\n      \n        ")
-            )
+            [
+              "<li>This image will be resized and padded to 33 x 33 px.</li>",
+              "<li>This image will be resized and padded to 99 x 99 px.</li>",
+              "<li>This image will be resized to fit 32 x 32 px.</li>",
+              "<li>This image will be resized to fit 100 x 100 px.</li>"
+            ].each do |value|
+              expect(html).to include(value)
+            end
           end
         end
       end
diff --git a/decidim-core/spec/system/data_consent/scripts_spec.rb b/decidim-core/spec/system/data_consent/scripts_spec.rb
index 04815ef10c8a5..77f70147d0472 100644
--- a/decidim-core/spec/system/data_consent/scripts_spec.rb
+++ b/decidim-core/spec/system/data_consent/scripts_spec.rb
@@ -51,10 +51,6 @@ def protect_against_forgery?
   let(:html_body) { "" }
 
   before do
-    # rubocop:disable RSpec/AnyInstance
-    allow_any_instance_of(Decidim::ViewModel).to receive(:redesign_enabled?).and_return(true)
-    # rubocop:enable RSpec/AnyInstance
-
     # Create a temporary route to display the generated HTML in a correct site
     # context.
     final_html = html_document
diff --git a/decidim-core/spec/system/social_share_button_spec.rb b/decidim-core/spec/system/social_share_button_spec.rb
index 0d7a85786975f..f0993ff5e4c46 100644
--- a/decidim-core/spec/system/social_share_button_spec.rb
+++ b/decidim-core/spec/system/social_share_button_spec.rb
@@ -5,44 +5,43 @@
 describe "Social share button", type: :system do
   let!(:resource) { create(:dummy_resource) }
   let(:resource_path) { Decidim::ResourceLocatorPresenter.new(resource).path }
-  let(:modal_selector) { Decidim.redesign_active ? "[data-social-share]" : ".social-share-button" }
 
   before { switch_to_host(resource.organization.host) }
 
   shared_examples_for "showing the social share buttons" do
     it "shows the 'socialShare' modal" do
       within "#socialShare", visible: :visible do
-        expect(page).to have_css("h3", text: "Share:")
-        expect(page).to have_css(modal_selector)
+        expect(page).to have_css("h2", text: "Share")
+        expect(page).to have_css("[data-social-share]")
       end
     end
 
     it "shows the 'Share to Twitter' button" do
-      within modal_selector do
+      within "[data-social-share]" do
         expect(page).to have_css('a[data-site="twitter"]')
       end
     end
 
     it "shows the 'Share to Facebook' button" do
-      within modal_selector do
+      within "[data-social-share]" do
         expect(page).to have_css('a[data-site="facebook"]')
       end
     end
 
     it "shows the 'Share to Telegram' button" do
-      within modal_selector do
+      within "[data-social-share]" do
         expect(page).to have_css('a[data-site="telegram"]')
       end
     end
 
     it "shows the 'Share to Whatsapp' button" do
-      within modal_selector do
+      within "[data-social-share]" do
         expect(page).to have_css('a[data-site="whatsapp"]')
       end
     end
 
     it "does not have the external domain warning in the URL" do
-      within modal_selector do
+      within "[data-social-share]" do
         link = find('a[data-site="telegram"]')
         expect(link[:href]).not_to include("/link?external_url")
       end
diff --git a/decidim-core/spec/system/user_group_manage_admins_spec.rb b/decidim-core/spec/system/user_group_manage_admins_spec.rb
index 2d61ab1142157..3cf5940f23f38 100644
--- a/decidim-core/spec/system/user_group_manage_admins_spec.rb
+++ b/decidim-core/spec/system/user_group_manage_admins_spec.rb
@@ -21,11 +21,7 @@
     end
 
     it "does not show the link to edit" do
-      if Decidim.redesign_active
-        expect(page).not_to have_content("Manage group")
-      else
-        expect(page).not_to have_content("Manage admins")
-      end
+      expect(page).not_to have_content("Manage group")
     end
 
     it "rejects the user that accesses manually" do
@@ -39,7 +35,7 @@
       login_as creator, scope: :user
       visit decidim.profile_path(user_group.nickname)
 
-      click_button "Manage group" if Decidim.redesign_active
+      click_button "Manage group"
       click_link "Manage admins"
     end
 
diff --git a/decidim-debates/app/controllers/decidim/debates/application_controller.rb b/decidim-debates/app/controllers/decidim/debates/application_controller.rb
index eb5757cd81db6..716e85985e0e8 100644
--- a/decidim-debates/app/controllers/decidim/debates/application_controller.rb
+++ b/decidim-debates/app/controllers/decidim/debates/application_controller.rb
@@ -8,7 +8,6 @@ module Debates
     # Note that it inherits from `Decidim::Components::BaseController`, which
     # override its layout and provide all kinds of useful methods.
     class ApplicationController < Decidim::Components::BaseController
-      redesign_participatory_space_layout skip_authorize_participatory_space: true
     end
   end
 end
diff --git a/decidim-dev/app/controllers/decidim/dummy_resources/dummy_resources_controller.rb b/decidim-dev/app/controllers/decidim/dummy_resources/dummy_resources_controller.rb
index 2c41e3abfed41..2525374289c95 100644
--- a/decidim-dev/app/controllers/decidim/dummy_resources/dummy_resources_controller.rb
+++ b/decidim-dev/app/controllers/decidim/dummy_resources/dummy_resources_controller.rb
@@ -6,8 +6,6 @@ class DummyResourcesController < Decidim::Components::BaseController
       helper Decidim::Comments::CommentsHelper
       include Decidim::TranslatableAttributes
 
-      redesign_participatory_space_layout only: :show
-
       def show
         @commentable = DummyResources::DummyResource.find(params[:id])
       end
diff --git a/decidim-dev/app/views/decidim/dummy_resources/dummy_resources/show.html.erb b/decidim-dev/app/views/decidim/dummy_resources/dummy_resources/show.html.erb
index 86d589a74d670..c1e91c32cd999 100644
--- a/decidim-dev/app/views/decidim/dummy_resources/dummy_resources/show.html.erb
+++ b/decidim-dev/app/views/decidim/dummy_resources/dummy_resources/show.html.erb
@@ -4,18 +4,22 @@
                            url: dummy_resource_url(@commentable)
                          }) %>
 
-<div id="resource" class="row">
-  <h2><%= translated_attribute(@commentable.title) %></h2>
-</div>
+<%= render layout: "layouts/decidim/shared/layout_item", locals: { commentable: @commentable } do %>
+  <h2 class="h2 decorator mb-8">
+    <%= translated_attribute(@commentable.title) %>
+  </h2>
 
-<div class="row">
-  <%= action_authorized_link_to :foo, foo_dummy_resource_path(@commentable) do %>
-    Foo
-  <% end %>
-</div>
-
-<div class="row">
-  <%= render partial: "decidim/shared/share_modal" %>
-</div>
+  <% content_for :aside do %>
+    <%= action_authorized_link_to :foo, foo_dummy_resource_path(@commentable) do %>
+      Foo
+    <% end %>
 
-<%= comments_for(@commentable) %>
+    <section class="layout-main__section layout-main__buttons" data-buttons>
+      <%= cell "decidim/comments_button", nil %>
+      <div class="ml-auto">
+        <%= cell "decidim/share_button", nil %>
+      </div>
+    </section>
+  <% end %>
+  <%= comments_for(@commentable) %>
+<% end %>
diff --git a/decidim-elections/app/controllers/decidim/elections/application_controller.rb b/decidim-elections/app/controllers/decidim/elections/application_controller.rb
index 61f8e91472e60..14c6a86dcc4e9 100644
--- a/decidim-elections/app/controllers/decidim/elections/application_controller.rb
+++ b/decidim-elections/app/controllers/decidim/elections/application_controller.rb
@@ -8,7 +8,6 @@ module Elections
     # Note that it inherits from `Decidim::Components::BaseController`, which
     # override its layout and provide all kinds of useful methods.
     class ApplicationController < Decidim::Components::BaseController
-      redesign_participatory_space_layout
       include Decidim::Elections::ContentSecurityPolicy
     end
   end
diff --git a/decidim-elections/app/controllers/decidim/votings/votings_controller.rb b/decidim-elections/app/controllers/decidim/votings/votings_controller.rb
index 764efad79c0d3..44e2a7101adb0 100644
--- a/decidim-elections/app/controllers/decidim/votings/votings_controller.rb
+++ b/decidim-elections/app/controllers/decidim/votings/votings_controller.rb
@@ -13,7 +13,7 @@ class VotingsController < Decidim::Votings::ApplicationController
       include Decidim::Votings::Orderable
       include Decidim::Elections::HasVoteFlow
 
-      redesign_participatory_space_layout only: [:show]
+      participatory_space_layout only: [:show]
 
       helper_method :published_votings, :paginated_votings, :filter, :promoted_votings, :only_finished_votings?, :landing_content_blocks, :census_contact_information
 
diff --git a/decidim-elections/app/views/layouts/decidim/redesigned_votings.html.erb b/decidim-elections/app/views/layouts/decidim/redesigned_votings.html.erb
deleted file mode 100644
index 8908cb066be30..0000000000000
--- a/decidim-elections/app/views/layouts/decidim/redesigned_votings.html.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<%= append_javascript_pack_tag "decidim_votings" %>
-<%= append_stylesheet_pack_tag "decidim_votings" %>
-
-<%= render "layouts/decidim/redesigned_application" do %>
-  <%= cell "decidim/translation_bar", current_organization %>
-
-  <main>
-    <%= yield %>
-  </main>
-<% end %>
-
-<% provide :meta_image_url, current_participatory_space.attached_uploader(:banner_image).path %>
diff --git a/decidim-elections/app/views/layouts/decidim/votings.html.erb b/decidim-elections/app/views/layouts/decidim/votings.html.erb
index e39e513811d8d..42642cc457867 100644
--- a/decidim-elections/app/views/layouts/decidim/votings.html.erb
+++ b/decidim-elections/app/views/layouts/decidim/votings.html.erb
@@ -1,17 +1,12 @@
+<%= append_javascript_pack_tag "decidim_votings" %>
+<%= append_stylesheet_pack_tag "decidim_votings" %>
+
 <%= render "layouts/decidim/application" do %>
+  <%= cell "decidim/translation_bar", current_organization %>
 
-  <div class="wrapper">
-    <%= cell "decidim/translation_bar", current_organization %>
+  <main>
     <%= yield %>
-  </div>
-
-  <% if content_for? :expanded %>
-    <div class="expanded">
-      <div class="wrapper wrapper--inner">
-        <div class="row">
-          <%= yield :expanded %>
-        </div>
-      </div>
-    </div>
-  <% end %>
+  </main>
 <% end %>
+
+<% provide :meta_image_url, current_participatory_space.attached_uploader(:banner_image).path %>
diff --git a/decidim-initiatives/app/controllers/decidim/initiatives/application_controller.rb b/decidim-initiatives/app/controllers/decidim/initiatives/application_controller.rb
index 903d42a20c6f8..ea0fc9eeab713 100644
--- a/decidim-initiatives/app/controllers/decidim/initiatives/application_controller.rb
+++ b/decidim-initiatives/app/controllers/decidim/initiatives/application_controller.rb
@@ -5,9 +5,6 @@ module Initiatives
     # The main admin application controller for initiatives
     class ApplicationController < Decidim::ApplicationController
       include NeedsPermission
-      include RedesignLayout
-      redesign active: true
-
       register_permissions(::Decidim::Initiatives::ApplicationController,
                            ::Decidim::Initiatives::Permissions,
                            ::Decidim::Admin::Permissions,
diff --git a/decidim-initiatives/app/controllers/decidim/initiatives/initiatives_controller.rb b/decidim-initiatives/app/controllers/decidim/initiatives/initiatives_controller.rb
index 11e75657b725b..3d4ff081a81fa 100644
--- a/decidim-initiatives/app/controllers/decidim/initiatives/initiatives_controller.rb
+++ b/decidim-initiatives/app/controllers/decidim/initiatives/initiatives_controller.rb
@@ -5,7 +5,6 @@ module Initiatives
     # This controller contains the logic regarding participants initiatives
     class InitiativesController < Decidim::Initiatives::ApplicationController
       include ParticipatorySpaceContext
-      redesign_participatory_space_layout only: [:show]
 
       helper Decidim::AttachmentsHelper
       helper Decidim::FiltersHelper
@@ -32,6 +31,8 @@ class InitiativesController < Decidim::Initiatives::ApplicationController
       helper_method :collection, :initiatives, :filter, :stats, :tabs, :panels
       helper_method :initiative_type, :available_initiative_types
 
+      before_action :authorize_participatory_space, only: [:show]
+
       # GET /initiatives
       def index
         enforce_permission_to :list, :initiative
@@ -51,6 +52,8 @@ def index
       # GET /initiatives/:id
       def show
         enforce_permission_to :read, :initiative, initiative: current_initiative
+
+        render layout: "decidim/initiative_head"
       end
 
       # GET /initiatives/:id/send_to_technical_validation
diff --git a/decidim-initiatives/app/views/decidim/initiatives/initiative_signatures/_wizard_steps.html.erb b/decidim-initiatives/app/views/decidim/initiatives/initiative_signatures/_wizard_steps.html.erb
index 5b0ba28961d71..8e6cd52008fdc 100644
--- a/decidim-initiatives/app/views/decidim/initiatives/initiative_signatures/_wizard_steps.html.erb
+++ b/decidim-initiatives/app/views/decidim/initiatives/initiative_signatures/_wizard_steps.html.erb
@@ -1,8 +1,3 @@
-<div class="text-center py-10">
-  <h1 class="h3 md:h1 decorator inline-block text-left">
-    <%= t("new", scope: "decidim.initiatives.create_initiative.select_initiative_type") %>
-  </h1>
-</div>
 <ol id="wizard-steps" class="wizard-steps">
   <% wizard_steps.each do |wizard_step| %>
     <% next if wizard_step.to_s == "promotal_committee" && !promotal_committee_required? %>
diff --git a/decidim-initiatives/app/views/decidim/initiatives/initiative_signatures/fill_personal_data.html.erb b/decidim-initiatives/app/views/decidim/initiatives/initiative_signatures/fill_personal_data.html.erb
index cdcbea4c67f87..b4e3095669216 100644
--- a/decidim-initiatives/app/views/decidim/initiatives/initiative_signatures/fill_personal_data.html.erb
+++ b/decidim-initiatives/app/views/decidim/initiatives/initiative_signatures/fill_personal_data.html.erb
@@ -1,40 +1,32 @@
 <%= cell("decidim/announcement", t("decidim.initiatives.initiative_signatures.fill_personal_data.help"), callout_class: "secondary") %>
 
-<h2 class="section-heading"><%= t(step, scope: "layouts.decidim.initiative_signature_creation_header") %></h2>
-
-<%= render partial: "wizard_steps" %>
-
-<div class="card">
-  <div class="card__content">
-    <%= decidim_form_for(@form, url: next_wizard_path, method: :put, html: { class: "form user_personal_data_signature_form" }) do |f| %>
-      <%= form_required_explanation %>
-      <div>
-        <div class="field">
-          <%= f.text_field :name_and_surname, autofocus: true, required: true %>
-        </div>
-
-        <div class="field">
-          <%= f.text_field :document_number, required: true %>
-        </div>
-
-        <div class="field date">
-          <%= f.date_select :date_of_birth, start_year: 1900, end_year: 16.years.ago.year, default: 35.years.ago, prompt: { day: t(".date_select.day"), month: t(".date_select.month"), year: t(".date_select.year") } %>
-        </div>
-
-        <div class="field">
-          <%= f.text_field :postal_code, required: true %>
-        </div>
-
-        <div class="pb-s">
-          <small class="text-small">
-          <%= strip_tags(translated_attribute(extra_data_legal_information)) %>
-          </small>
-        </div>
-      </div>
+<%= decidim_form_for(@form, url: next_wizard_path, method: :put) do |f| %>
+  <%= form_required_explanation %>
+  <div>
+    <div class="form__wrapper">
+      <%= f.text_field :name_and_surname, autofocus: true, required: true %>
+    </div>
+
+    <div class="form__wrapper">
+      <%= f.text_field :document_number, required: true %>
+    </div>
+
+    <div class="form__wrapper">
+      <%= f.date_select :date_of_birth, start_year: 1900, end_year: 16.years.ago.year, default: 35.years.ago, prompt: { day: t(".date_select.day"), month: t(".date_select.month"), year: t(".date_select.year") } %>
+    </div>
+
+    <div class="form__wrapper">
+      <%= f.text_field :postal_code, required: true %>
+    </div>
+
+    <div class="pb-s">
+      <small class="text-small">
+      <%= strip_tags(translated_attribute(extra_data_legal_information)) %>
+      </small>
+    </div>
+  </div>
 
-      <div class="actions">
-        <%= f.submit t(".continue"), class: "button expanded" %>
-      </div>
-    <% end %>
+  <div class="form__wrapper-block">
+    <%= f.submit t(".continue"), class: "button button__sm md:button__lg button__secondary" %>
   </div>
-</div>
+<% end %>
diff --git a/decidim-initiatives/app/views/decidim/initiatives/initiative_signatures/finish.html.erb b/decidim-initiatives/app/views/decidim/initiatives/initiative_signatures/finish.html.erb
index 72a73836a9fe0..bec148361d8be 100644
--- a/decidim-initiatives/app/views/decidim/initiatives/initiative_signatures/finish.html.erb
+++ b/decidim-initiatives/app/views/decidim/initiatives/initiative_signatures/finish.html.erb
@@ -1,12 +1,6 @@
 <%= cell("decidim/announcement", t("decidim.initiatives.initiative_votes.create.success_html"), callout_class: "secondary", title: translated_attribute(current_initiative.title)) %>
 
-<h2 class="section-heading"><%= t("finished", scope: "layouts.decidim.initiative_signature_creation_header") %></h2>
-
-<%= render partial: "wizard_steps" %>
-
-<div class="card">
-  <br>
-  <div class="column actions">
-    <%= link_to t(".back_to_initiative"), initiative_path(current_initiative), class: "button white-button expanded" %>
-  </div>
-</div>
+<%= link_to initiative_path(current_initiative), class: "button button__sm md:button__lg button__text-secondary" do %>
+  <%= icon "arrow-left-line" %>
+  <%= t(".back_to_initiative") %>
+<% end %>
diff --git a/decidim-initiatives/app/views/decidim/initiatives/initiative_signatures/sms_code.html.erb b/decidim-initiatives/app/views/decidim/initiatives/initiative_signatures/sms_code.html.erb
index 4fbb52feaffa0..b71d1c4443733 100644
--- a/decidim-initiatives/app/views/decidim/initiatives/initiative_signatures/sms_code.html.erb
+++ b/decidim-initiatives/app/views/decidim/initiatives/initiative_signatures/sms_code.html.erb
@@ -1,18 +1,11 @@
 <%= cell("decidim/announcement", t("decidim.initiatives.initiative_signatures.sms_code.help"), callout_class: "secondary") %>
-<h2 class="section-heading"><%= t(step, scope: "layouts.decidim.initiative_signature_creation_header") %></h2>
 
-<%= render partial: "wizard_steps" %>
-
-<div class="card">
-  <div class="card__content">
-    <%= decidim_form_for(@form, url: next_wizard_path, method: :put, html: { class: "form sms_code" }) do |f| %>
-      <div class="field">
-        <%= f.text_field :verification_code %>
-      </div>
+<%= decidim_form_for(@form, url: next_wizard_path, method: :put) do |f| %>
+  <div class="form__wrapper">
+    <%= f.text_field :verification_code %>
+  </div>
 
-      <div class="actions">
-        <%= f.submit t(".continue"), class: "button expanded" %>
-       </div>
-    <% end %>
+  <div class="form__wrapper-block">
+    <%= f.submit t(".continue"), class: "button button__sm md:button__lg button__secondary" %>
   </div>
-</div>
+<% end %>
diff --git a/decidim-initiatives/app/views/decidim/initiatives/initiative_signatures/sms_phone_number.html.erb b/decidim-initiatives/app/views/decidim/initiatives/initiative_signatures/sms_phone_number.html.erb
index 060b341f00401..26cefa7e3381a 100644
--- a/decidim-initiatives/app/views/decidim/initiatives/initiative_signatures/sms_phone_number.html.erb
+++ b/decidim-initiatives/app/views/decidim/initiatives/initiative_signatures/sms_phone_number.html.erb
@@ -1,18 +1,10 @@
 <%= cell("decidim/announcement", t("decidim.initiatives.initiative_signatures.sms_phone_number.help"), callout_class: "secondary") %>
-<h2 class="section-heading"><%= t(step, scope: "layouts.decidim.initiative_signature_creation_header") %></h2>
-
-<%= render partial: "wizard_steps" %>
-
-<div class="card">
-  <div class="card__content">
-    <%= decidim_form_for(@form, url: next_wizard_path, method: :put, html: { class: "form mobile_phone_number" }) do |f| %>
-      <div class="field">
-        <%= f.text_field :mobile_phone_number %>
-      </div>
+<%= decidim_form_for(@form, url: next_wizard_path, method: :put) do |f| %>
+  <div class="form__wrapper">
+    <%= f.text_field :mobile_phone_number %>
+  </div>
 
-      <div class="actions">
-        <%= f.submit t(".continue"), class: "button expanded" %>
-       </div>
-    <% end %>
+  <div class="form__wrapper-block">
+    <%= f.submit t(".continue"), class: "button button__sm md:button__lg button__secondary" %>
   </div>
-</div>
+<% end %>
diff --git a/decidim-initiatives/app/views/decidim/initiatives/initiatives/edit.html.erb b/decidim-initiatives/app/views/decidim/initiatives/initiatives/edit.html.erb
index 7e91d999dbe3e..175bed915df7d 100644
--- a/decidim-initiatives/app/views/decidim/initiatives/initiatives/edit.html.erb
+++ b/decidim-initiatives/app/views/decidim/initiatives/initiatives/edit.html.erb
@@ -1,10 +1,11 @@
 <% add_decidim_page_title(action_name) %>
 
-<div class="text-center py-10">
-  <h1 class="h3 md:h1 decorator inline-block text-left"><%= t("title", scope: "decidim.initiatives.edit") %></h1>
-</div>
+<%= render layout:"layouts/decidim/shared/layout_center", locals: { main_enabled: false } do %>
+  <div class="text-center py-10">
+    <h1 class="h3 md:h1 decorator inline-block text-left"><%= t("title", scope: "decidim.initiatives.edit") %></h1>
+  </div>
 
-<%= decidim_form_for @form, html: { class: "form__wrapper edit_initiative" } do |f| %>
+  <%= decidim_form_for @form, html: { class: "form__wrapper edit_initiative" } do |f| %>
     <%= render partial: "form", object: f %>
     <div class="form__wrapper-block flex-col-reverse md:flex-row justify-between">
       <%= link_to :back, class: "button button__sm md:button__lg button__text-secondary" do %>
@@ -68,3 +69,4 @@
       <% end %>
     </div>
   <% end %>
+<% end %>
diff --git a/decidim-initiatives/app/views/decidim/initiatives/initiatives/index.html.erb b/decidim-initiatives/app/views/decidim/initiatives/initiatives/index.html.erb
index d3f4809411251..bc3da36cae854 100644
--- a/decidim-initiatives/app/views/decidim/initiatives/initiatives/index.html.erb
+++ b/decidim-initiatives/app/views/decidim/initiatives/initiatives/index.html.erb
@@ -19,9 +19,8 @@ edit_link(
 <% end %>
 
 <%= render layout: "layouts/decidim/shared/layout_two_col" do %>
-  <%= participatory_space_wrapper do %>
-    <div id="initiatives">
-      <%= render partial: "initiatives" %>
-    </div>
-  <% end %>
+  <%= participatory_space_floating_help %>
+  <div id="initiatives">
+    <%= render partial: "initiatives" %>
+  </div>
 <% end %>
diff --git a/decidim-initiatives/app/views/decidim/initiatives/initiatives/show.html.erb b/decidim-initiatives/app/views/decidim/initiatives/initiatives/show.html.erb
index 1b3de0f96a0c1..bed5ad2e53441 100644
--- a/decidim-initiatives/app/views/decidim/initiatives/initiatives/show.html.erb
+++ b/decidim-initiatives/app/views/decidim/initiatives/initiatives/show.html.erb
@@ -14,10 +14,6 @@ edit_link(
 )
 %>
 
-<%= participatory_space_floating_help %>
-
-<% add_decidim_page_title(translated_attribute(current_initiative.title)) %>
-
 <%= content_for :aside do %>
   <section class="initiative__aside">
     <% if current_initiative.published? || current_initiative.rejected? || current_initiative.accepted? || current_initiative.discarded? %>
@@ -147,6 +143,10 @@ edit_link(
   </section>
 <% end %>
 
+<%= participatory_space_floating_help %>
+
+<% add_decidim_page_title(translated_attribute(current_initiative.title)) %>
+
 <section class="layout-main__section layout-main__heading">
   <h2 class="h2 decorator">
     <%= translated_attribute(current_initiative.title) %>
diff --git a/decidim-initiatives/app/views/layouts/decidim/_initiative_creation_header.html.erb b/decidim-initiatives/app/views/layouts/decidim/_initiative_creation_header.html.erb
index b409e5f349a9f..8904171b0d547 100644
--- a/decidim-initiatives/app/views/layouts/decidim/_initiative_creation_header.html.erb
+++ b/decidim-initiatives/app/views/layouts/decidim/_initiative_creation_header.html.erb
@@ -1,5 +1,5 @@
-<div class="text-center py-10">
-  <h1 class="h3 md:h1 decorator inline-block text-left">
+<div class="flex justify-center">
+  <h1 class="h3 md:h1 decorator my-12">
     <%= t("new", scope: "decidim.initiatives.create_initiative.select_initiative_type") %>
   </h1>
 </div>
diff --git a/decidim-initiatives/app/views/layouts/decidim/_initiative_signature_creation_header.html.erb b/decidim-initiatives/app/views/layouts/decidim/_initiative_signature_creation_header.html.erb
index 1ccaf109dddf0..347e0fe60eadb 100644
--- a/decidim-initiatives/app/views/layouts/decidim/_initiative_signature_creation_header.html.erb
+++ b/decidim-initiatives/app/views/layouts/decidim/_initiative_signature_creation_header.html.erb
@@ -1,13 +1,6 @@
-<div class="columns large-3">
-  <div class="m-bottom">
-    <%= link_to initiative_path current_initiative do %>
-      <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %> <%= t(".back") %>
-    <% end %>
-  </div>
-  <div class="section">
-    <p>
-      <%= t(".title", initiative_title: translated_attribute(current_initiative.title)) %>
-    </p>
-  </div>
-  <%= render partial: "wizard_steps" %>
+<div class="flex justify-center">
+  <h1 class="h3 md:h1 decorator my-12">
+    <%= t(".title", initiative_title: translated_attribute(current_initiative.title)) %>
+  </h1>
 </div>
+<%= render partial: "wizard_steps" %>
diff --git a/decidim-initiatives/app/views/layouts/decidim/initiative.html.erb b/decidim-initiatives/app/views/layouts/decidim/initiative.html.erb
index 0c987234dbcab..3a6078c7b0d40 100644
--- a/decidim-initiatives/app/views/layouts/decidim/initiative.html.erb
+++ b/decidim-initiatives/app/views/layouts/decidim/initiative.html.erb
@@ -1,7 +1,9 @@
 <%= append_javascript_pack_tag "decidim_initiatives" %>
 <%= append_stylesheet_pack_tag "decidim_initiatives", media: "all" %>
 
-<%= render "layouts/decidim/redesigned_application" do %>
+<% provide :meta_image_url, current_participatory_space.type.attached_uploader(:banner_image).path %>
+
+<%= render "layouts/decidim/application" do %>
   <%= render layout: "layouts/decidim/shared/layout_center" do %>
     <main>
       <%= yield %>
diff --git a/decidim-initiatives/app/views/layouts/decidim/initiative_creation.html.erb b/decidim-initiatives/app/views/layouts/decidim/initiative_creation.html.erb
index d29a2ed42c0eb..599052eedefcc 100644
--- a/decidim-initiatives/app/views/layouts/decidim/initiative_creation.html.erb
+++ b/decidim-initiatives/app/views/layouts/decidim/initiative_creation.html.erb
@@ -1,19 +1,10 @@
+<%= append_javascript_pack_tag "decidim_initiatives" %>
+<%= append_stylesheet_pack_tag "decidim_initiatives", media: "all" %>
+<%= append_stylesheet_pack_tag "decidim_verifications", media: "all" %>
+
 <%= render "layouts/decidim/application" do %>
-  <% if action_name == "select_initiative_type" %>
-    <div class="wrapper">
-      <%= yield %>
-    </div>
-  <% else %>
-    <div class="wrapper">
-      <div class="row">
-        <%= render partial: "layouts/decidim/initiative_creation_header" %>
-        <div class="columns large-6">
-          <%= yield %>
-        </div>
-        <div class="columns large-3"></div>
-      </div>
-    </div>
+  <%= render layout: "layouts/decidim/shared/layout_center" do %>
+    <%= render partial: "layouts/decidim/initiative_creation_header" %>
+    <%= yield %>
   <% end %>
-
-  <%= append_javascript_pack_tag "decidim_initiatives" %>
 <% end %>
diff --git a/decidim-initiatives/app/views/layouts/decidim/redesigned_initiative.html.erb b/decidim-initiatives/app/views/layouts/decidim/initiative_head.html.erb
similarity index 89%
rename from decidim-initiatives/app/views/layouts/decidim/redesigned_initiative.html.erb
rename to decidim-initiatives/app/views/layouts/decidim/initiative_head.html.erb
index e1f312676f2cb..b1f1b8f9826b6 100644
--- a/decidim-initiatives/app/views/layouts/decidim/redesigned_initiative.html.erb
+++ b/decidim-initiatives/app/views/layouts/decidim/initiative_head.html.erb
@@ -3,7 +3,7 @@
 
 <% provide :meta_image_url, current_initiative.type.attached_uploader(:banner_image).path %>
 
-<%= render "layouts/decidim/redesigned_application" do %>
+<%= render "layouts/decidim/application" do %>
   <%= render partial: "decidim/initiatives/initiatives/initiative_hero" %>
   <%= render layout:"layouts/decidim/shared/layout_two_col", locals: { reverse: true, main_enabled: false } do %>
     <main>
diff --git a/decidim-initiatives/app/views/layouts/decidim/initiative_signature_creation.html.erb b/decidim-initiatives/app/views/layouts/decidim/initiative_signature_creation.html.erb
index 2deb7ccbb8085..5634716ef5e3e 100644
--- a/decidim-initiatives/app/views/layouts/decidim/initiative_signature_creation.html.erb
+++ b/decidim-initiatives/app/views/layouts/decidim/initiative_signature_creation.html.erb
@@ -1,13 +1,7 @@
 <%= render "layouts/decidim/application" do %>
-  <div class="wrapper">
-  <div class="row">
+  <%= render layout:"layouts/decidim/shared/layout_center", locals: { main_enabled: false } do %>
     <%= render partial: "layouts/decidim/initiative_signature_creation_header" %>
-    <div class="columns large-6">
-      <%= yield %>
-    </div>
-    <div class="columns large-3"></div>
-  </div>
-  </div>
-
-  <%= append_javascript_pack_tag "decidim_initiatives" %>
+    <%= yield %>
+    <%= append_javascript_pack_tag "decidim_initiatives" %>
+  <% end %>
 <% end %>
diff --git a/decidim-initiatives/app/views/layouts/decidim/redesigned_initiative_creation.html.erb b/decidim-initiatives/app/views/layouts/decidim/redesigned_initiative_creation.html.erb
deleted file mode 100644
index a9da710420104..0000000000000
--- a/decidim-initiatives/app/views/layouts/decidim/redesigned_initiative_creation.html.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<%= append_javascript_pack_tag "decidim_initiatives" %>
-<%= append_stylesheet_pack_tag "decidim_initiatives", media: "all" %>
-
-<%= render "layouts/decidim/redesigned_application" do %>
-  <%= render layout: "layouts/decidim/shared/layout_center" do %>
-    <%= render partial: "layouts/decidim/initiative_creation_header" %>
-    <%= yield %>
-  <% end %>
-<% end %>
diff --git a/decidim-initiatives/app/views/layouts/decidim/redesigned_initiative_signature_creation.html.erb b/decidim-initiatives/app/views/layouts/decidim/redesigned_initiative_signature_creation.html.erb
deleted file mode 100644
index 2deb7ccbb8085..0000000000000
--- a/decidim-initiatives/app/views/layouts/decidim/redesigned_initiative_signature_creation.html.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<%= render "layouts/decidim/application" do %>
-  <div class="wrapper">
-  <div class="row">
-    <%= render partial: "layouts/decidim/initiative_signature_creation_header" %>
-    <div class="columns large-6">
-      <%= yield %>
-    </div>
-    <div class="columns large-3"></div>
-  </div>
-  </div>
-
-  <%= append_javascript_pack_tag "decidim_initiatives" %>
-<% end %>
diff --git a/decidim-initiatives/config/locales/en.yml b/decidim-initiatives/config/locales/en.yml
index ba80af2b28645..ca383320b9011 100644
--- a/decidim-initiatives/config/locales/en.yml
+++ b/decidim-initiatives/config/locales/en.yml
@@ -618,10 +618,8 @@ en:
       initiative_header:
         initiative_menu_item: Initiative
       initiative_signature_creation_header:
-        back: Back
         fill_personal_data: Complete your data
         finish: Finish
-        finished: Initiative signature created
         sms_code: SMS code verification
         sms_phone_number: Mobile phone number
         title: Sign %{initiative_title}
diff --git a/decidim-initiatives/spec/system/initiative_signing_sms_verification_spec.rb b/decidim-initiatives/spec/system/initiative_signing_sms_verification_spec.rb
index 32dfc5b8eac37..0cfeab3df9730 100644
--- a/decidim-initiatives/spec/system/initiative_signing_sms_verification_spec.rb
+++ b/decidim-initiatives/spec/system/initiative_signing_sms_verification_spec.rb
@@ -58,7 +58,7 @@
     let(:initiatives_type) { create(:initiatives_type, :with_sms_code_validation, organization:) }
 
     it "The sms step appears" do
-      expect(page).to have_content("MOBILE PHONE NUMBER")
+      expect(page).to have_content("Mobile phone number")
     end
   end
 
diff --git a/decidim-meetings/app/controllers/decidim/meetings/application_controller.rb b/decidim-meetings/app/controllers/decidim/meetings/application_controller.rb
index 1ca85028ff3b7..33205f8c3751f 100644
--- a/decidim-meetings/app/controllers/decidim/meetings/application_controller.rb
+++ b/decidim-meetings/app/controllers/decidim/meetings/application_controller.rb
@@ -8,8 +8,6 @@ module Meetings
     # Note that it inherits from `Decidim::Components::BaseController`, which
     # override its layout and provide all kinds of useful methods.
     class ApplicationController < Decidim::Components::BaseController
-      redesign_participatory_space_layout
-
       helper Decidim::Meetings::ApplicationHelper
 
       private
diff --git a/decidim-meetings/app/controllers/decidim/meetings/meeting_closes_controller.rb b/decidim-meetings/app/controllers/decidim/meetings/meeting_closes_controller.rb
index 08ca82cc4e1be..c82a997e9d778 100644
--- a/decidim-meetings/app/controllers/decidim/meetings/meeting_closes_controller.rb
+++ b/decidim-meetings/app/controllers/decidim/meetings/meeting_closes_controller.rb
@@ -9,8 +9,6 @@ class MeetingClosesController < Decidim::Meetings::ApplicationController
 
       helper_method :meeting
 
-      redesign active: true
-
       def edit
         enforce_permission_to(:close, :meeting, meeting:)
 
diff --git a/decidim-meetings/app/controllers/decidim/meetings/meetings_controller.rb b/decidim-meetings/app/controllers/decidim/meetings/meetings_controller.rb
index dbe7c2737b0bf..d2aea60516192 100644
--- a/decidim-meetings/app/controllers/decidim/meetings/meetings_controller.rb
+++ b/decidim-meetings/app/controllers/decidim/meetings/meetings_controller.rb
@@ -18,8 +18,6 @@ class MeetingsController < Decidim::Meetings::ApplicationController
 
       helper_method :meetings, :meeting, :registration, :search, :nav_paths, :tab_panel_items
 
-      redesign active: true
-
       before_action :add_addtional_csp_directives, only: [:show]
 
       def new
diff --git a/decidim-meetings/app/controllers/decidim/meetings/registrations_controller.rb b/decidim-meetings/app/controllers/decidim/meetings/registrations_controller.rb
index 77ccd79e41d2e..e391d0da83c4a 100644
--- a/decidim-meetings/app/controllers/decidim/meetings/registrations_controller.rb
+++ b/decidim-meetings/app/controllers/decidim/meetings/registrations_controller.rb
@@ -6,8 +6,6 @@ module Meetings
     class RegistrationsController < Decidim::Meetings::ApplicationController
       include Decidim::Forms::Concerns::HasQuestionnaire
 
-      redesign active: true
-
       def answer
         enforce_permission_to(:join, :meeting, meeting:)
 
diff --git a/decidim-meetings/app/controllers/decidim/meetings/versions_controller.rb b/decidim-meetings/app/controllers/decidim/meetings/versions_controller.rb
index 9c2005c632682..f43d416399fcf 100644
--- a/decidim-meetings/app/controllers/decidim/meetings/versions_controller.rb
+++ b/decidim-meetings/app/controllers/decidim/meetings/versions_controller.rb
@@ -6,8 +6,6 @@ module Meetings
     class VersionsController < Decidim::Meetings::ApplicationController
       include Decidim::ResourceVersionsConcern
 
-      redesign active: true
-
       def versioned_resource
         @versioned_resource ||= Meeting.not_hidden.where(component: current_component).find(params[:meeting_id])
       end
diff --git a/decidim-meetings/app/views/decidim/meetings/layouts/live_event.html.erb b/decidim-meetings/app/views/decidim/meetings/layouts/live_event.html.erb
index 211b78aa02e1e..bf5ad4e06fe14 100644
--- a/decidim-meetings/app/views/decidim/meetings/layouts/live_event.html.erb
+++ b/decidim-meetings/app/views/decidim/meetings/layouts/live_event.html.erb
@@ -3,43 +3,43 @@
   <head>
     <title><%= decidim_page_title %></title>
     <%= render partial: "layouts/decidim/head" %>
+
+    <%# REDESIGN PENDING: for performance reasons defer this javacript call would be good, although there are references to jquery that need to be reviewed %>
+    <%= append_javascript_pack_tag "decidim_meetings" %>
+    <%= append_javascript_pack_tag "decidim_forms" %>
+    <%= stylesheet_pack_tag "decidim_meetings", media: "all" %>
+    <%= stylesheet_pack_tag "decidim_forms", media: "all" %>
   </head>
 
-  <body>
+  <body class="meeting-polls__body">
     <%= render partial: "layouts/decidim/timeout_modal" %>
-    <%= render partial: "layouts/decidim/data_consent_warning" %>
-    <%= cell("decidim/data_consent", current_organization) %>
 
     <header class="meeting-polls__header">
       <% if current_user && poll %>
-        <div class="flex--cc">
-          <button class="meeting-polls__button meeting-polls__action-list">
-            <%= t(".questions") %> <span id="visible-questions-count">(<%= questionnaire.questions.visible.count %>)</span>
+        <div class="flex gap-2">
+          <button class="button button__sm button__secondary meeting-polls__action-list">
+            <%= t("questions", scope: "decidim.meetings.layouts.live_event") %> <span id="visible-questions-count">(<%= questionnaire.questions.visible.count %>)</span>
           </button>
 
           <% if admin_allowed_to?(:update, :poll, meeting: meeting, poll: poll) %>
-            <button class="meeting-polls__button meeting-polls__action-administrate"><%= t(".administrate") %></button>
+            <button class="button button__sm button__secondary meeting-polls__action-administrate"><%= t("administrate", scope: "decidim.meetings.layouts.live_event") %></button>
           <% end %>
         </div>
       <% end %>
 
       <div>
-        <strong class="text-secondary"><%= current_organization.name %></strong> / <strong><%= present(meeting).title(links: true, html_escape: true) %></strong>
+        <strong class="text-secondary"><%= current_organization.name %></strong> / <strong><%= present(meeting).title(links: true, html_escape: true ) %></strong>
       </div>
 
-      <div class="flex--cc">
+      <div class="flex gap-10">
         <% if current_user %>
-          <span>
-            <%= link_to current_user.name, decidim.account_path, target: "_blank", "aria-label": t("layouts.decidim.user_menu.account", name: current_user.name) %>
-          </span>
+          <%= link_to current_user.name, decidim.account_path, target: "_blank", class: "button button__sm button__text-secondary", data: { "external-link": false }, "aria-label": t("layouts.decidim.user_menu.account", name: current_user.name) %>
         <% end %>
 
-        <span class="meeting-polls__close">
-          <%= link_to meeting_path(meeting), "aria-label": t(".close") do %>
-            <%= t(".close") %>
-            <%= icon "x", class: "text-small" %>
-          <% end %>
-        </span>
+        <%= link_to meeting_path(meeting), class: "button button__sm button__text-secondary", "aria-label": t("close", scope: "decidim.meetings.layouts.live_event") do %>
+          <span><%= t("close", scope: "decidim.meetings.layouts.live_event") %></span>
+          <%= icon "close-line" %>
+        <% end %>
       </div>
     </header>
 
@@ -49,7 +49,9 @@
       <%= yield %>
     </main>
 
-    <%= append_javascript_pack_tag "decidim_meetings" %>
-    <%= render partial: "layouts/decidim/decidim_javascript" %>
+    <%= render partial: "layouts/decidim/data_consent_warning" %>
+    <%= cell("decidim/data_consent", current_organization) %>
+    <%= render partial: "layouts/decidim/redesinged_decidim_javascript" %>
+
   </body>
 </html>
diff --git a/decidim-meetings/app/views/decidim/meetings/layouts/redesigned_live_event.html.erb b/decidim-meetings/app/views/decidim/meetings/layouts/redesigned_live_event.html.erb
deleted file mode 100644
index ac9ac3a87a76f..0000000000000
--- a/decidim-meetings/app/views/decidim/meetings/layouts/redesigned_live_event.html.erb
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE html>
-<html lang="<%= I18n.locale %>" class="no-js">
-  <head>
-    <title><%= decidim_page_title %></title>
-    <%= render partial: "layouts/decidim/redesigned_head" %>
-
-    <%# REDESIGN PENDING: for performance reasons defer this javacript call would be good, although there are references to jquery that need to be reviewed %>
-    <%= append_javascript_pack_tag "decidim_meetings" %>
-    <%= append_javascript_pack_tag "decidim_forms" %>
-    <%= stylesheet_pack_tag "decidim_meetings", media: "all" %>
-    <%= stylesheet_pack_tag "decidim_forms", media: "all" %>
-  </head>
-
-  <body class="meeting-polls__body">
-    <%= render partial: "layouts/decidim/redesigned_timeout_modal" %>
-
-    <header class="meeting-polls__header">
-      <% if current_user && poll %>
-        <div class="flex gap-2">
-          <button class="button button__sm button__secondary meeting-polls__action-list">
-            <%= t("questions", scope: "decidim.meetings.layouts.live_event") %> <span id="visible-questions-count">(<%= questionnaire.questions.visible.count %>)</span>
-          </button>
-
-          <% if admin_allowed_to?(:update, :poll, meeting: meeting, poll: poll) %>
-            <button class="button button__sm button__secondary meeting-polls__action-administrate"><%= t("administrate", scope: "decidim.meetings.layouts.live_event") %></button>
-          <% end %>
-        </div>
-      <% end %>
-
-      <div>
-        <strong class="text-secondary"><%= current_organization.name %></strong> / <strong><%= present(meeting).title(links: true, html_escape: true ) %></strong>
-      </div>
-
-      <div class="flex gap-10">
-        <% if current_user %>
-          <%= link_to current_user.name, decidim.account_path, target: "_blank", class: "button button__sm button__text-secondary", data: { "external-link": false }, "aria-label": t("layouts.decidim.user_menu.account", name: current_user.name) %>
-        <% end %>
-
-        <%= link_to meeting_path(meeting), class: "button button__sm button__text-secondary", "aria-label": t("close", scope: "decidim.meetings.layouts.live_event") do %>
-          <span><%= t("close", scope: "decidim.meetings.layouts.live_event") %></span>
-          <%= icon "close-line" %>
-        <% end %>
-      </div>
-    </header>
-
-    <main class="meeting-polls__main">
-      <aside class="meeting-polls__aside" id="meeting-poll-aside" data-decidim-meetings-poll='{"questionsUrl":"<%= meeting_polls_questions_path(meeting) %>"}'></aside>
-      <aside class="meeting-polls__aside" id="admin-meeting-poll-aside" data-decidim-admin-meetings-poll='{"questionsUrl":"<%= meeting_polls_questions_path(meeting, admin: true) %>"}'></aside>
-      <%= yield %>
-    </main>
-
-    <%= render partial: "layouts/decidim/data_consent_warning" %>
-    <%= cell("decidim/data_consent", current_organization) %>
-    <%= render partial: "layouts/decidim/redesinged_decidim_javascript" %>
-
-  </body>
-</html>
diff --git a/decidim-meetings/app/views/decidim/participatory_spaces/_upcoming_meeting_for_card.html.erb b/decidim-meetings/app/views/decidim/participatory_spaces/_upcoming_meeting_for_card.html.erb
index 6f5b66d528a73..1bf9a7c6e543e 100644
--- a/decidim-meetings/app/views/decidim/participatory_spaces/_upcoming_meeting_for_card.html.erb
+++ b/decidim-meetings/app/views/decidim/participatory_spaces/_upcoming_meeting_for_card.html.erb
@@ -1,10 +1,3 @@
 <span data-upcoming-meeting>
-  <% if redesign_enabled? %>
-    <%= format_date_range(upcoming_meeting.start_time, upcoming_meeting.end_time) %>
-  <% else %>
-    <div class="card__block">
-      <strong class="text-small"><%= t("upcoming_meeting", scope: "decidim.participatory_spaces.upcoming_meeting_for_card") %></strong>
-      <%= cell("decidim/meetings/meeting_m", upcoming_meeting).date %>
-    </div>
-  <% end %>
+  <%= format_date_range(upcoming_meeting.start_time, upcoming_meeting.end_time) %>
 </span>
diff --git a/decidim-meetings/config/locales/en.yml b/decidim-meetings/config/locales/en.yml
index 0d98329ed2e0d..ee42e4ff14a51 100644
--- a/decidim-meetings/config/locales/en.yml
+++ b/decidim-meetings/config/locales/en.yml
@@ -647,8 +647,6 @@ en:
         past_meetings: Past meetings
         see_all: See all meetings
         upcoming_meetings: Upcoming meetings
-      upcoming_meeting_for_card:
-        upcoming_meeting: Upcoming meeting
     resource_links:
       meetings_through_proposals:
         meeting_result: 'Related results:'
diff --git a/decidim-pages/app/controllers/decidim/pages/application_controller.rb b/decidim-pages/app/controllers/decidim/pages/application_controller.rb
index 329a9dc7a29a5..101507d9281a6 100644
--- a/decidim-pages/app/controllers/decidim/pages/application_controller.rb
+++ b/decidim-pages/app/controllers/decidim/pages/application_controller.rb
@@ -8,8 +8,6 @@ module Pages
     # Note that it inherits from `Decidim::Components::Basecontroller`, which
     # override its layout and provide all kinds of useful methods.
     class ApplicationController < Decidim::Components::BaseController
-      redesign_participatory_space_layout
-
       def show
         @page = Page.find_by(component: current_component)
       end
diff --git a/decidim-participatory_processes/app/controllers/decidim/participatory_processes/application_controller.rb b/decidim-participatory_processes/app/controllers/decidim/participatory_processes/application_controller.rb
index bddc921d00e3e..987eb1f383c00 100644
--- a/decidim-participatory_processes/app/controllers/decidim/participatory_processes/application_controller.rb
+++ b/decidim-participatory_processes/app/controllers/decidim/participatory_processes/application_controller.rb
@@ -9,9 +9,6 @@ class ApplicationController < Decidim::ApplicationController
       helper ParticipatoryProcessHelper
       include NeedsPermission
 
-      include RedesignLayout
-      redesign active: true
-
       register_permissions(Decidim::ParticipatoryProcesses::ApplicationController,
                            ::Decidim::ParticipatoryProcesses::Permissions,
                            ::Decidim::Admin::Permissions,
diff --git a/decidim-participatory_processes/app/controllers/decidim/participatory_processes/participatory_processes_controller.rb b/decidim-participatory_processes/app/controllers/decidim/participatory_processes/participatory_processes_controller.rb
index 4c2213707cdd3..adfc63fe0caf3 100644
--- a/decidim-participatory_processes/app/controllers/decidim/participatory_processes/participatory_processes_controller.rb
+++ b/decidim-participatory_processes/app/controllers/decidim/participatory_processes/participatory_processes_controller.rb
@@ -6,7 +6,7 @@ module ParticipatoryProcesses
     # public layout.
     class ParticipatoryProcessesController < Decidim::ParticipatoryProcesses::ApplicationController
       include ParticipatorySpaceContext
-      redesign_participatory_space_layout only: [:show, :all_metrics]
+      participatory_space_layout only: [:show, :all_metrics]
       include FilterResource
       include Paginable
       include HasParticipatorySpaceContentBlocks
diff --git a/decidim-participatory_processes/app/views/layouts/decidim/participatory_process.html.erb b/decidim-participatory_processes/app/views/layouts/decidim/participatory_process.html.erb
index caa939506d9a8..99d9efb751599 100644
--- a/decidim-participatory_processes/app/views/layouts/decidim/participatory_process.html.erb
+++ b/decidim-participatory_processes/app/views/layouts/decidim/participatory_process.html.erb
@@ -5,21 +5,13 @@
   description: translated_attribute(current_participatory_space.short_description)
 ) %>
 
+<%= append_javascript_pack_tag "decidim_participatory_processes" %>
+<%= append_stylesheet_pack_tag "decidim_participatory_processes", media: "all" %>
+
 <%= render "layouts/decidim/application" do %>
-  <%= render partial: "layouts/decidim/process_header" %>
-  <%= cell "decidim/translation_bar", current_organization %>
-  <div class="wrapper">
+  <main>
     <%= yield %>
-  </div>
-  <% if content_for? :expanded %>
-    <div class="expanded">
-      <div class="wrapper wrapper--inner">
-        <div class="row">
-          <%= yield :expanded %>
-        </div>
-      </div>
-    </div>
-  <% end %>
+  </main>
 <% end %>
 
 <% provide :meta_image_url, current_participatory_space.attached_uploader(:banner_image).path %>
diff --git a/decidim-participatory_processes/app/views/layouts/decidim/redesigned_participatory_process.html.erb b/decidim-participatory_processes/app/views/layouts/decidim/redesigned_participatory_process.html.erb
deleted file mode 100644
index 3345a7644a0b8..0000000000000
--- a/decidim-participatory_processes/app/views/layouts/decidim/redesigned_participatory_process.html.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<% add_decidim_page_title(translated_attribute(current_component.name)) if try(:current_component) %>
-<% add_decidim_page_title(translated_attribute(current_participatory_space.title)) %>
-<% add_decidim_meta_tags(
-  image_url: current_participatory_space.attached_uploader(:banner_image).path,
-  description: translated_attribute(current_participatory_space.short_description)
-) %>
-
-<%= append_javascript_pack_tag "decidim_participatory_processes" %>
-<%= append_stylesheet_pack_tag "decidim_participatory_processes", media: "all" %>
-
-<%= render "layouts/decidim/redesigned_application" do %>
-  <%= cell "decidim/translation_bar", current_organization %>
-
-  <main>
-    <%= yield %>
-  </main>
-<% end %>
-
-<% provide :meta_image_url, current_participatory_space.attached_uploader(:banner_image).path %>
diff --git a/decidim-proposals/app/controllers/decidim/proposals/application_controller.rb b/decidim-proposals/app/controllers/decidim/proposals/application_controller.rb
index 2e948d4059ec5..fda58112e631d 100644
--- a/decidim-proposals/app/controllers/decidim/proposals/application_controller.rb
+++ b/decidim-proposals/app/controllers/decidim/proposals/application_controller.rb
@@ -8,8 +8,6 @@ module Proposals
     # Note that it inherits from `Decidim::Components::BaseController`, which
     # override its layout and provide all kinds of useful methods.
     class ApplicationController < Decidim::Components::BaseController
-      redesign_participatory_space_layout skip_authorize_participatory_space: true
-
       helper Decidim::Messaging::ConversationHelper
       helper_method :proposal_limit_reached?
 
diff --git a/decidim-proposals/app/controllers/decidim/proposals/proposals_controller.rb b/decidim-proposals/app/controllers/decidim/proposals/proposals_controller.rb
index 48fbace992baa..75983ee457412 100644
--- a/decidim-proposals/app/controllers/decidim/proposals/proposals_controller.rb
+++ b/decidim-proposals/app/controllers/decidim/proposals/proposals_controller.rb
@@ -25,8 +25,6 @@ class ProposalsController < Decidim::Proposals::ApplicationController
 
       before_action :set_participatory_text
 
-      redesign active: true
-
       # rubocop:disable Naming/VariableNumber
       STEP1 = :step_1
       STEP2 = :step_2
diff --git a/decidim-proposals/spec/helpers/map_helper_spec.rb b/decidim-proposals/spec/helpers/map_helper_spec.rb
index 935bf836397fe..d268aff5f809e 100644
--- a/decidim-proposals/spec/helpers/map_helper_spec.rb
+++ b/decidim-proposals/spec/helpers/map_helper_spec.rb
@@ -18,14 +18,6 @@ module Proposals
       let(:longitude) { 2.1234 }
       let(:redesign_enabled) { false }
 
-      before do
-        # rubocop:disable RSpec/AnyInstance
-        allow_any_instance_of(ActionView::Base).to receive(:redesign_enabled?).and_return(redesign_enabled)
-        allow_any_instance_of(ActionView::Base).to receive(:redesigned_layout).and_return("decidim/proposals/proposal_metadata")
-        allow_any_instance_of(Decidim::Proposals::ProposalMetadataCell).to receive(:redesign_enabled?).and_return(redesign_enabled)
-        # rubocop:enable RSpec/AnyInstance
-      end
-
       describe "#has_position?" do
         subject { helper.has_position?(proposal) }
 
diff --git a/decidim-sortitions/app/controllers/decidim/sortitions/application_controller.rb b/decidim-sortitions/app/controllers/decidim/sortitions/application_controller.rb
index 6d968e07f8ad6..c4cf388be48de 100644
--- a/decidim-sortitions/app/controllers/decidim/sortitions/application_controller.rb
+++ b/decidim-sortitions/app/controllers/decidim/sortitions/application_controller.rb
@@ -8,7 +8,6 @@ module Sortitions
     # Note that it inherits from `Decidim::Components::BaseController`, which
     # override its layout and provide all kinds of useful methods.
     class ApplicationController < Decidim::Components::BaseController
-      redesign_participatory_space_layout
     end
   end
 end
diff --git a/decidim-sortitions/spec/system/decidim/sortitions/sortitions_spec.rb b/decidim-sortitions/spec/system/decidim/sortitions/sortitions_spec.rb
index b329fd68af341..6227156ba268b 100644
--- a/decidim-sortitions/spec/system/decidim/sortitions/sortitions_spec.rb
+++ b/decidim-sortitions/spec/system/decidim/sortitions/sortitions_spec.rb
@@ -57,7 +57,9 @@
 
         within "form.new_filter" do
           fill_in("filter[search_text_cont]", with: "foobar")
-          click_button "Search"
+          within "div.filter-search" do
+            click_button
+          end
         end
 
         expect(page).not_to have_content("Another sortition")
diff --git a/decidim-surveys/app/controllers/decidim/surveys/application_controller.rb b/decidim-surveys/app/controllers/decidim/surveys/application_controller.rb
index 9d1304b681050..fa7d219490368 100644
--- a/decidim-surveys/app/controllers/decidim/surveys/application_controller.rb
+++ b/decidim-surveys/app/controllers/decidim/surveys/application_controller.rb
@@ -8,7 +8,6 @@ module Surveys
     # Note that it inherits from `Decidim::Components::BaseController`, which
     # override its layout and provide all kinds of useful methods.
     class ApplicationController < Decidim::Components::BaseController
-      redesign_participatory_space_layout skip_authorize_participatory_space: true
     end
   end
 end
diff --git a/decidim-surveys/app/controllers/decidim/surveys/surveys_controller.rb b/decidim-surveys/app/controllers/decidim/surveys/surveys_controller.rb
index c6e927e9eb7ac..b684da53fd301 100644
--- a/decidim-surveys/app/controllers/decidim/surveys/surveys_controller.rb
+++ b/decidim-surveys/app/controllers/decidim/surveys/surveys_controller.rb
@@ -6,7 +6,9 @@ module Surveys
     class SurveysController < Decidim::Surveys::ApplicationController
       include Decidim::Forms::Concerns::HasQuestionnaire
       include Decidim::ComponentPathHelper
-      helper Decidim::Surveys::SurveyHelper
+      include Decidim::Surveys::SurveyHelper
+
+      helper_method :authorizations
 
       delegate :allow_unregistered?, to: :current_settings
 
diff --git a/decidim-surveys/app/helpers/decidim/surveys/survey_helper.rb b/decidim-surveys/app/helpers/decidim/surveys/survey_helper.rb
index 5fda9d220ce80..3dc86fe251b25 100644
--- a/decidim-surveys/app/helpers/decidim/surveys/survey_helper.rb
+++ b/decidim-surveys/app/helpers/decidim/surveys/survey_helper.rb
@@ -4,9 +4,7 @@ module Decidim
   module Surveys
     module SurveyHelper
       def no_permission
-        render(
-          partial: "decidim/authorization_modals/content"
-        )
+        cell "decidim/authorization_modal", authorizations
       end
 
       def resource
diff --git a/decidim-surveys/app/views/decidim/surveys/surveys/no_permission.html.erb b/decidim-surveys/app/views/decidim/surveys/surveys/no_permission.html.erb
index 8aebb51d05104..ac40a528e46d3 100644
--- a/decidim-surveys/app/views/decidim/surveys/surveys/no_permission.html.erb
+++ b/decidim-surveys/app/views/decidim/surveys/surveys/no_permission.html.erb
@@ -2,7 +2,7 @@
   <div class="columns large-6 medium-centered">
     <div class="card">
       <div class="card__content">
-        <%= render partial: "decidim/authorization_modals/content" %>
+        <%= cell "decidim/authorization_modal", authorizations %>
       </div>
     </div>
   </div>
diff --git a/decidim-system/app/controllers/decidim/system/application_controller.rb b/decidim-system/app/controllers/decidim/system/application_controller.rb
index d316101b5996e..09a9a32fd4abe 100644
--- a/decidim-system/app/controllers/decidim/system/application_controller.rb
+++ b/decidim-system/app/controllers/decidim/system/application_controller.rb
@@ -8,7 +8,6 @@ class ApplicationController < ActionController::Base
       include PayloadInfo
       include Headers::HttpCachingDisabler
       include DisableRedirectionToExternalHost
-      include DisabledRedesignLayout
 
       protect_from_forgery with: :exception, prepend: true
 
diff --git a/decidim-system/app/controllers/decidim/system/oauth_applications_controller.rb b/decidim-system/app/controllers/decidim/system/oauth_applications_controller.rb
index 49822b5743c6f..b9adea5c053ed 100644
--- a/decidim-system/app/controllers/decidim/system/oauth_applications_controller.rb
+++ b/decidim-system/app/controllers/decidim/system/oauth_applications_controller.rb
@@ -5,6 +5,8 @@ module System
     # Controller that allows managing OAuth applications at the admin panel.
     #
     class OAuthApplicationsController < Decidim::System::ApplicationController
+      include DisabledRedesignLayout
+
       helper Decidim::Admin::AttributesDisplayHelper
 
       def index
diff --git a/decidim-system/app/views/layouts/decidim/system/application.html.erb b/decidim-system/app/views/layouts/decidim/system/application.html.erb
index 5355b45276d2d..9d70cdfba11c0 100644
--- a/decidim-system/app/views/layouts/decidim/system/application.html.erb
+++ b/decidim-system/app/views/layouts/decidim/system/application.html.erb
@@ -36,7 +36,7 @@
       </div>
     </div>
   </div>
-  <%= render partial: "decidim/shared/confirm_modal" %>
+  <%= render partial: "decidim/admin/shared/admin_confirm_modal" %>
   <%= render partial: "layouts/decidim/system/js_configuration" %>
   <%= render partial: "layouts/decidim/cors" if Decidim.cors_enabled %>
 </body>
diff --git a/decidim-verifications/app/controllers/decidim/verifications/authorizations_controller.rb b/decidim-verifications/app/controllers/decidim/verifications/authorizations_controller.rb
index 7bdda0b957b65..c9df1989a5d03 100644
--- a/decidim-verifications/app/controllers/decidim/verifications/authorizations_controller.rb
+++ b/decidim-verifications/app/controllers/decidim/verifications/authorizations_controller.rb
@@ -23,8 +23,6 @@ def new; end
       def index
         @granted_authorizations = granted_authorizations
         @pending_authorizations = pending_authorizations
-
-        render layout: redesigned_layout("layouts/decidim/user_profile")
       end
 
       def first_login
diff --git a/decidim-verifications/app/views/layouts/decidim/authorizations.html.erb b/decidim-verifications/app/views/layouts/decidim/authorizations.html.erb
index 4b71e3fd76eb1..631af881dc9be 100644
--- a/decidim-verifications/app/views/layouts/decidim/authorizations.html.erb
+++ b/decidim-verifications/app/views/layouts/decidim/authorizations.html.erb
@@ -1,3 +1,8 @@
+<%= append_javascript_pack_tag "decidim_verifications" %>
+<%= append_stylesheet_pack_tag "decidim_verifications" %>
+
 <%= render "layouts/decidim/application" do %>
-  <%= yield %>
+  <%= render layout: "layouts/decidim/shared/layout_center" do %>
+    <%= yield %>
+  <% end %>
 <% end %>
diff --git a/decidim-verifications/app/views/layouts/decidim/redesigned_authorizations.html.erb b/decidim-verifications/app/views/layouts/decidim/redesigned_authorizations.html.erb
deleted file mode 100644
index 269f5083a5bb4..0000000000000
--- a/decidim-verifications/app/views/layouts/decidim/redesigned_authorizations.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<%= append_javascript_pack_tag "decidim_verifications" %>
-<%= append_stylesheet_pack_tag "decidim_verifications" %>
-
-<%= render "layouts/decidim/redesigned_application" do %>
-  <%= render layout: "layouts/decidim/shared/layout_center" do %>
-    <%= yield %>
-  <% end %>
-<% end %>
diff --git a/decidim-verifications/spec/views/decidim/verifications/authorizations/new.html.erb_spec.rb b/decidim-verifications/spec/views/decidim/verifications/authorizations/new.html.erb_spec.rb
index 858d0f2c869d8..d7936ff48037b 100644
--- a/decidim-verifications/spec/views/decidim/verifications/authorizations/new.html.erb_spec.rb
+++ b/decidim-verifications/spec/views/decidim/verifications/authorizations/new.html.erb_spec.rb
@@ -20,7 +20,6 @@ module Decidim
       allow(view).to receive(:authorizations_path).and_return("/authorizations")
       allow(view).to receive(:stored_location).and_return("/processes")
       allow(view).to receive(:redirect_url).and_return("/")
-      allow(view).to receive(:redesign_enabled?).and_return(Decidim.redesign_active)
     end
 
     it "renders the form from the partial" do
diff --git a/decidim_app-design/app/views/layouts/redesigned.html.erb b/decidim_app-design/app/views/layouts/redesigned.html.erb
index 9bd5d306f7448..8934c4d38d661 100644
--- a/decidim_app-design/app/views/layouts/redesigned.html.erb
+++ b/decidim_app-design/app/views/layouts/redesigned.html.erb
@@ -9,7 +9,7 @@
   </head>
 
   <body>
-    <%= render "layouts/decidim/redesigned_wrapper" do %>
+    <%= render "layouts/decidim/wrapper" do %>
       <%= yield %>
     <% end %>
 

From 843454b219c37bc7bbdf76a450503f9313540cfa Mon Sep 17 00:00:00 2001
From: Hugoren Martinako <aumpfbahn@gmail.com>
Date: Fri, 28 Jul 2023 08:14:56 +0200
Subject: [PATCH 06/14] Redesign: meetings map (#11383)

* hide markup when map is not available

* add condition index pages

* add condition
---
 .../meetings/highlighted_meetings_for_component/show.erb  | 8 +++++---
 .../meetings/highlighted_meetings_for_component_cell.rb   | 4 ++++
 .../decidim/meetings/directory/meetings/index.html.erb    | 2 +-
 .../app/views/decidim/meetings/meetings/index.html.erb    | 2 +-
 .../app/views/decidim/proposals/proposals/index.html.erb  | 2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/decidim-meetings/app/cells/decidim/meetings/highlighted_meetings_for_component/show.erb b/decidim-meetings/app/cells/decidim/meetings/highlighted_meetings_for_component/show.erb
index 6252dc0fd737a..20926f5ff7aee 100644
--- a/decidim-meetings/app/cells/decidim/meetings/highlighted_meetings_for_component/show.erb
+++ b/decidim-meetings/app/cells/decidim/meetings/highlighted_meetings_for_component/show.erb
@@ -14,9 +14,11 @@
     <% end %>
   <% end %>
 </div>
-<div class="meeting-list__block-map">
-  <%= cell "decidim/meetings/meetings_map", collection %>
-</div>
+<% if show_map? %>
+  <div class="meeting-list__block-map">
+    <%= cell "decidim/meetings/meetings_map", collection %>
+  </div>
+<% end %>
 <div class="meeting-list__block-list">
   <% if show_calendar? %>
     <div class="meeting-list__block-list-aside">
diff --git a/decidim-meetings/app/cells/decidim/meetings/highlighted_meetings_for_component_cell.rb b/decidim-meetings/app/cells/decidim/meetings/highlighted_meetings_for_component_cell.rb
index 768c6712a9622..9beefd7bc8a1b 100644
--- a/decidim-meetings/app/cells/decidim/meetings/highlighted_meetings_for_component_cell.rb
+++ b/decidim-meetings/app/cells/decidim/meetings/highlighted_meetings_for_component_cell.rb
@@ -61,6 +61,10 @@ def show_upcoming_meetings?
         @show_upcoming_meetings ||= options[:force_upcoming] || upcoming_meetings.present?
       end
 
+      def show_map?
+        Decidim::Map.available?(:geocoding, :dynamic)
+      end
+
       def show_calendar?
         @show_calendar ||= show_upcoming_meetings? && collection.minimum(:start_time).before?(2.months.from_now.beginning_of_month)
       end
diff --git a/decidim-meetings/app/views/decidim/meetings/directory/meetings/index.html.erb b/decidim-meetings/app/views/decidim/meetings/directory/meetings/index.html.erb
index 100df5c2f066c..2fd498b861cc7 100644
--- a/decidim-meetings/app/views/decidim/meetings/directory/meetings/index.html.erb
+++ b/decidim-meetings/app/views/decidim/meetings/directory/meetings/index.html.erb
@@ -1,5 +1,5 @@
 <%= render partial: "decidim/meetings/shared/index", locals: {
-      display_map: true,
+      display_map: Decidim::Map.available?(:geocoding, :dynamic),
       display_announcement: false,
       component: nil,
       search_variable: :title_or_description_cont,
diff --git a/decidim-meetings/app/views/decidim/meetings/meetings/index.html.erb b/decidim-meetings/app/views/decidim/meetings/meetings/index.html.erb
index 7b97fb7b2f244..8a66f4b65a03b 100644
--- a/decidim-meetings/app/views/decidim/meetings/meetings/index.html.erb
+++ b/decidim-meetings/app/views/decidim/meetings/meetings/index.html.erb
@@ -1,5 +1,5 @@
 <%= render partial: "decidim/meetings/shared/index", locals: {
-      display_map: current_component.settings.maps_enabled? && search.result.not_online.exists?,
+      display_map: Decidim::Map.available?(:geocoding, :dynamic) && current_component.settings.maps_enabled? && search.result.not_online.exists?,
       display_announcement: true,
       component: current_component,
       search_variable: :search_text_cont,
diff --git a/decidim-proposals/app/views/decidim/proposals/proposals/index.html.erb b/decidim-proposals/app/views/decidim/proposals/proposals/index.html.erb
index 6e7582b443d28..204b8fadb7de1 100644
--- a/decidim-proposals/app/views/decidim/proposals/proposals/index.html.erb
+++ b/decidim-proposals/app/views/decidim/proposals/proposals/index.html.erb
@@ -29,7 +29,7 @@
 
 <%= render layout: "layouts/decidim/shared/layout_two_col" do %>
 
-  <% if component_settings.geocoding_enabled? %>
+  <% if Decidim::Map.available?(:geocoding, :dynamic) && component_settings.geocoding_enabled? %>
     <div class="proposal-list__map">
       <%= dynamic_map_for proposals_data_for_map(@all_geocoded_proposals) do %>
         <template id="marker-popup">

From 976431dbb78a1deb4f2c03cdeea3ead22b4aa10f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eduardo=20Mart=C3=ADnez?= <eduardomech@gmail.com>
Date: Fri, 28 Jul 2023 08:32:59 +0200
Subject: [PATCH 07/14] Redesign: participatory process steps (#11226)

* allow passing options to Dialogs via data-attributes

* Extract to process step modal to a cell with an option to display open

* Change path in process dropdown metadata for steps to call index with steps modal open

* Change paths in participatory processes events to not use steps index path

* Adapt participatory process steps specs to redesign using steps modal

* Remove participatory process steps index path, controller and views

* Hide active step item from dropdown metadata if there are no steps present

* fix styles after a11y refactor

* Replace hard coded text with translation

---------

Co-authored-by: Hugoren Martinako <aumpfbahn@gmail.com>
Co-authored-by: Fernando Blat <fernando@blat.es>
---
 .../_redesigned_participatory_spaces.scss     |  8 +++-
 .../content_blocks/extra_data/active_step.erb | 33 -----------------
 .../content_blocks/extra_data_cell.rb         |  2 -
 .../process_dropdown_metadata/metadata.erb    | 20 +++++-----
 .../process_dropdown_metadata_cell.rb         |  4 ++
 .../process_step/show.erb                     | 34 +++++++++++++++++
 .../process_step_cell.rb                      | 30 +++++++++++++++
 .../participatory_process_steps_controller.rb | 28 --------------
 ...ticipatory_process_step_activated_event.rb |  7 ++--
 ...articipatory_process_step_changed_event.rb |  7 ++--
 .../_participatory_process_step.html.erb      | 16 --------
 .../_timeline.html.erb                        |  7 ----
 .../index.html.erb                            | 18 ---------
 .../participatory_processes/show.html.erb     |  2 +
 .../decidim/_process_header_steps.html.erb    | 37 -------------------
 .../config/locales/en.yml                     |  4 --
 .../decidim/participatory_processes/engine.rb |  1 -
 ...atory_process_step_activated_event_spec.rb |  7 ++--
 ...ipatory_process_step_changed_event_spec.rb |  7 ++--
 .../participatory_process_steps_spec.rb       |  8 ++--
 20 files changed, 106 insertions(+), 174 deletions(-)
 create mode 100644 decidim-participatory_processes/app/cells/decidim/participatory_processes/process_step/show.erb
 create mode 100644 decidim-participatory_processes/app/cells/decidim/participatory_processes/process_step_cell.rb
 delete mode 100644 decidim-participatory_processes/app/controllers/decidim/participatory_processes/participatory_process_steps_controller.rb
 delete mode 100644 decidim-participatory_processes/app/views/decidim/participatory_process_steps/_participatory_process_step.html.erb
 delete mode 100644 decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_process_steps/_timeline.html.erb
 delete mode 100644 decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_process_steps/index.html.erb
 delete mode 100644 decidim-participatory_processes/app/views/layouts/decidim/_process_header_steps.html.erb

diff --git a/decidim-core/app/packs/stylesheets/decidim/_redesigned_participatory_spaces.scss b/decidim-core/app/packs/stylesheets/decidim/_redesigned_participatory_spaces.scss
index 8e1c2a5580630..ce64ef3f46f2a 100644
--- a/decidim-core/app/packs/stylesheets/decidim/_redesigned_participatory_spaces.scss
+++ b/decidim-core/app/packs/stylesheets/decidim/_redesigned_participatory_spaces.scss
@@ -109,15 +109,19 @@
       @apply font-normal pb-16;
 
       &__list {
-        @apply space-y-6;
+        @apply space-y-6 relative;
 
         &-container {
           @apply mt-8 flex flex-col md:flex-row gap-6 md:gap-0 divide-background-3 md:divide-x md:[&>*]:px-10 first:[&>*]:pl-0 last:[&>*]:pr-0;
         }
+
+        > * {
+          @apply relative before:absolute before:w-px before:-z-10 before:left-[18px] before:bg-gray-3 before:h-[calc(100%+1.5rem)] last:before:h-[36px] before:-top-[18px] first:before:top-[18px];
+        }
       }
 
       &__step {
-        @apply flex items-baseline gap-2 relative before:absolute before:w-px before:-z-10 before:left-[18px] before:bg-gray-3 before:h-[calc(100%+1.5rem)] last:before:h-[36px] before:-top-[18px] first:before:top-[18px];
+        @apply flex items-baseline gap-2 text-left;
 
         > :first-child {
           @apply flex-none w-9 h-9 rounded-full inline-grid place-items-center text-secondary bg-background;
diff --git a/decidim-participatory_processes/app/cells/decidim/participatory_processes/content_blocks/extra_data/active_step.erb b/decidim-participatory_processes/app/cells/decidim/participatory_processes/content_blocks/extra_data/active_step.erb
index e62dcb00b082a..08e5aee395fd3 100644
--- a/decidim-participatory_processes/app/cells/decidim/participatory_processes/content_blocks/extra_data/active_step.erb
+++ b/decidim-participatory_processes/app/cells/decidim/participatory_processes/content_blocks/extra_data/active_step.erb
@@ -1,34 +1 @@
 <button data-dialog-open="process-steps-modal"><%= active_step_name %></button>
-
-<%= decidim_modal id: "process-steps-modal", class: "participatory-space__metadata-modal" do %>
-  <div data-dialog-container>
-    <%= icon "flag-line" %>
-    <h3 id="dialog-title-process-steps-modal" data-dialog-title><%= t("participatory_process_steps.index.process_steps", scope: "decidim") %></h3>
-    <div>
-      <div class="participatory-space__metadata-modal__list-container" data-component="accordion" data-multiselectable="false" data-collapsible="false">
-        <ol class="participatory-space__metadata-modal__list">
-          <% steps.each_with_index do |step, i| %>
-            <% active = step == active_step %>
-            <li class="participatory-space__metadata-modal__step<%= " is-active" if active %>" data-controls="panel-process-steps-<%= i %>" data-open="<%= "true" if active %>">
-              <div><%= step.position + 1 %></div>
-              <div>
-                <span class="participatory-space__metadata-modal__step-title">
-                  <span class="participatory-space__metadata-modal__step-current">Fase Actual</span>
-                  <%= translated_attribute(step.title) %>
-                </span>
-                <span class="participatory-space__metadata-modal__step-dates"><%= step_dates(step) %></span>
-              </div>
-            </li>
-          <% end %>
-        </ol>
-        <div>
-          <% steps.each_with_index do |step, i| %>
-            <div id="panel-process-steps-<%= i %>" class="editor-content">
-              <%= decidim_sanitize_editor_admin(translated_attribute(step.description)) %>
-            </div>
-          <% end %>
-        </div>
-      </div>
-    </div>
-  </div>
-<% end %>
diff --git a/decidim-participatory_processes/app/cells/decidim/participatory_processes/content_blocks/extra_data_cell.rb b/decidim-participatory_processes/app/cells/decidim/participatory_processes/content_blocks/extra_data_cell.rb
index 846c02bbf11fd..531d18e727366 100644
--- a/decidim-participatory_processes/app/cells/decidim/participatory_processes/content_blocks/extra_data_cell.rb
+++ b/decidim-participatory_processes/app/cells/decidim/participatory_processes/content_blocks/extra_data_cell.rb
@@ -5,8 +5,6 @@ module ParticipatoryProcesses
     module ContentBlocks
       class ExtraDataCell < Decidim::ContentBlocks::ParticipatorySpaceExtraDataCell
         include ParticipatorySpaceContentBlocksHelper
-        include ParticipatoryProcessHelper
-        include Decidim::ModalHelper
 
         delegate :steps, :active_step, :start_date, :end_date, :participatory_process_group, to: :resource
 
diff --git a/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_dropdown_metadata/metadata.erb b/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_dropdown_metadata/metadata.erb
index 9d10d32c20d3a..e591f8cd8213c 100644
--- a/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_dropdown_metadata/metadata.erb
+++ b/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_dropdown_metadata/metadata.erb
@@ -1,15 +1,17 @@
 <h4 class="menu-bar__secondary-dropdown__title"><%= title %></h4>
 <div class="menu-bar__secondary-dropdown__metadata">
-  <span>
-    <%= icon "direction-line", class: "text-gray fill-current" %>
+  <% if display_steps? %>
+    <span>
+      <%= icon "direction-line", class: "text-gray fill-current" %>
 
-    <span class="font-semibold"><%= t("layouts.decidim.participatory_processes.participatory_process.active_step") %></span>
-    <%= link_to(
-      step_title,
-      decidim_participatory_processes.participatory_process_participatory_process_steps_path(process),
-      class: "text-secondary underline"
-    ) %>
-  </span>
+      <span class="font-semibold"><%= t("layouts.decidim.participatory_processes.participatory_process.active_step") %></span>
+      <%= link_to(
+        step_title,
+        decidim_participatory_processes.participatory_process_path(process, display_steps: true),
+        class: "text-secondary underline"
+      ) %>
+    </span>
+  <% end %>
 
   <% if hashtag.present? %>
     <span>
diff --git a/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_dropdown_metadata_cell.rb b/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_dropdown_metadata_cell.rb
index 37b374f400f10..e191a937e8dae 100644
--- a/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_dropdown_metadata_cell.rb
+++ b/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_dropdown_metadata_cell.rb
@@ -29,6 +29,10 @@ def step_title
         translated_attribute process.active_step&.title
       end
 
+      def display_steps?
+        process.steps.present?
+      end
+
       def nav_items_method = :process_nav_items
     end
   end
diff --git a/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_step/show.erb b/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_step/show.erb
new file mode 100644
index 0000000000000..3a76973930682
--- /dev/null
+++ b/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_step/show.erb
@@ -0,0 +1,34 @@
+<%= decidim_modal id: "process-steps-modal", class: "participatory-space__metadata-modal", data: do %>
+  <div data-dialog-container>
+    <%= icon "flag-line" %>
+    <h3 id="dialog-title-process-steps-modal" data-dialog-title><%= t("participatory_process_steps.index.process_steps", scope: "decidim") %></h3>
+    <div>
+      <div class="participatory-space__metadata-modal__list-container" data-component="accordion" data-multiselectable="false" data-collapsible="false">
+        <ol class="participatory-space__metadata-modal__list">
+          <% steps.each_with_index do |step, i| %>
+            <% active = step == active_step %>
+            <li>
+              <button id="trigger-process-steps-<%= i %>" class="participatory-space__metadata-modal__step<%= " is-active" if active %>" data-controls="panel-process-steps-<%= i %>" data-open="<%= "true" if active %>">
+                <span><%= step.position + 1 %></span>
+                <span>
+                  <span class="participatory-space__metadata-modal__step-title">
+                    <span class="participatory-space__metadata-modal__step-current"><%= t("active_step", scope: "layouts.decidim.participatory_processes.participatory_process") %></span>
+                    <%= translated_attribute(step.title) %>
+                  </span>
+                  <span class="participatory-space__metadata-modal__step-dates"><%= step_dates(step) %></span>
+                </span>
+              </button>
+            </li>
+          <% end %>
+        </ol>
+        <div>
+          <% steps.each_with_index do |step, i| %>
+            <div id="panel-process-steps-<%= i %>" class="editor-content">
+              <%= decidim_sanitize_editor_admin(translated_attribute(step.description)) %>
+            </div>
+          <% end %>
+        </div>
+      </div>
+    </div>
+  </div>
+<% end %>
diff --git a/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_step_cell.rb b/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_step_cell.rb
new file mode 100644
index 0000000000000..0bb4cc4f2cb56
--- /dev/null
+++ b/decidim-participatory_processes/app/cells/decidim/participatory_processes/process_step_cell.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    class ProcessStepCell < Decidim::ViewModel
+      include ParticipatoryProcessHelper
+      include Decidim::ModalHelper
+
+      delegate :steps, :active_step, to: :model
+
+      def show
+        return if steps.blank?
+
+        render
+      end
+
+      private
+
+      def display_steps?
+        [true, "true"].include? options[:display_steps]
+      end
+
+      def data
+        return unless display_steps?
+
+        { is_open: true }
+      end
+    end
+  end
+end
diff --git a/decidim-participatory_processes/app/controllers/decidim/participatory_processes/participatory_process_steps_controller.rb b/decidim-participatory_processes/app/controllers/decidim/participatory_processes/participatory_process_steps_controller.rb
deleted file mode 100644
index 204f663116e91..0000000000000
--- a/decidim-participatory_processes/app/controllers/decidim/participatory_processes/participatory_process_steps_controller.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module ParticipatoryProcesses
-    # A controller that holds the logic to show ParticipatoryProcessSteps in a
-    # public layout.
-    class ParticipatoryProcessStepsController < Decidim::ParticipatoryProcesses::ApplicationController
-      include ParticipatorySpaceContext
-      participatory_space_layout only: :index
-
-      def index; end
-
-      private
-
-      def organization_participatory_processes
-        @organization_participatory_processes ||= OrganizationParticipatoryProcesses.new(current_organization).query
-      end
-
-      def current_participatory_space
-        return unless params[:participatory_process_slug]
-
-        @current_participatory_space ||= organization_participatory_processes.where(slug: params[:participatory_process_slug]).or(
-          organization_participatory_processes.where(id: params[:participatory_process_slug])
-        ).first!
-      end
-    end
-  end
-end
diff --git a/decidim-participatory_processes/app/events/decidim/participatory_process_step_activated_event.rb b/decidim-participatory_processes/app/events/decidim/participatory_process_step_activated_event.rb
index c5bed08318908..6a55029cbc395 100644
--- a/decidim-participatory_processes/app/events/decidim/participatory_process_step_activated_event.rb
+++ b/decidim-participatory_processes/app/events/decidim/participatory_process_step_activated_event.rb
@@ -5,13 +5,14 @@ class ParticipatoryProcessStepActivatedEvent < Decidim::Events::SimpleEvent
     include Rails.application.routes.mounted_helpers
 
     def resource_path
-      @resource_path ||= decidim_participatory_processes.participatory_process_participatory_process_steps_path(participatory_process_slug: participatory_space.slug)
+      @resource_path ||= decidim_participatory_processes.participatory_process_path(participatory_space, display_steps: true)
     end
 
     def resource_url
       @resource_url ||= decidim_participatory_processes
-                        .participatory_process_participatory_process_steps_url(
-                          participatory_process_slug: participatory_space.slug,
+                        .participatory_process_url(
+                          participatory_space,
+                          display_steps: true,
                           host: participatory_space.organization.host
                         )
     end
diff --git a/decidim-participatory_processes/app/events/decidim/participatory_process_step_changed_event.rb b/decidim-participatory_processes/app/events/decidim/participatory_process_step_changed_event.rb
index fbc17facbe0a7..4c2857348ed6b 100644
--- a/decidim-participatory_processes/app/events/decidim/participatory_process_step_changed_event.rb
+++ b/decidim-participatory_processes/app/events/decidim/participatory_process_step_changed_event.rb
@@ -5,13 +5,14 @@ class ParticipatoryProcessStepChangedEvent < Decidim::Events::SimpleEvent
     include Rails.application.routes.mounted_helpers
 
     def resource_path
-      @resource_path ||= decidim_participatory_processes.participatory_process_participatory_process_steps_path(participatory_process_slug: participatory_space.slug)
+      @resource_path ||= decidim_participatory_processes.participatory_process_path(participatory_space, display_steps: true)
     end
 
     def resource_url
       @resource_url ||= decidim_participatory_processes
-                        .participatory_process_participatory_process_steps_url(
-                          participatory_process_slug: participatory_space.slug,
+                        .participatory_process_url(
+                          participatory_space,
+                          display_steps: true,
                           host: participatory_space.organization.host
                         )
     end
diff --git a/decidim-participatory_processes/app/views/decidim/participatory_process_steps/_participatory_process_step.html.erb b/decidim-participatory_processes/app/views/decidim/participatory_process_steps/_participatory_process_step.html.erb
deleted file mode 100644
index 59c555c857abe..0000000000000
--- a/decidim-participatory_processes/app/views/decidim/participatory_process_steps/_participatory_process_step.html.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<li class="<%= "timeline__item #{step_status_class}" %>">
-  <div class="timeline__phase">
-    <span class="timeline__phase__number"><%= participatory_process_step.position + 1 %></span>
-  </div>
-  <div class="timeline__info">
-    <div class="timeline__header">
-      <span class="timeline__date text-small">
-        <%= participatory_space_helpers.step_dates(participatory_process_step) %>
-      </span>
-      <h3 class="timeline__title heading4"><%= translated_attribute(participatory_process_step.title) %></h3>
-    </div>
-    <div class="timeline__content">
-      <%= decidim_sanitize_editor_admin translated_attribute(participatory_process_step.description) %>
-    </div>
-  </div>
-</li>
diff --git a/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_process_steps/_timeline.html.erb b/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_process_steps/_timeline.html.erb
deleted file mode 100644
index 4ee3113a59f02..0000000000000
--- a/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_process_steps/_timeline.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<ol class="timeline">
-  <% past_step = true %>
-  <% current_participatory_space.steps.each do |step| %>
-    <%= render step, step_status_class: step_class(step, past_step) %>
-    <% past_step = false if step.active? %>
-  <% end %>
-</ol>
diff --git a/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_process_steps/index.html.erb b/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_process_steps/index.html.erb
deleted file mode 100644
index a13a616ac8aa3..0000000000000
--- a/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_process_steps/index.html.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-<% add_decidim_page_title(t("participatory_process_steps.index.title", scope: "decidim")) %>
-<div class="steps">
-  <div class="row column">
-    <div class="row">
-      <div class="columns mediumlarge-9 large-7">
-        <div class="section">
-          <%= link_to participatory_process_path(current_participatory_space), class: "small hollow" do %>
-            <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
-            <%= t(".back_to_process") %>
-          <% end %>
-
-          <h2 class="section-heading"><%= t("participatory_process_steps.index.process_steps", scope: "decidim") %></h2>
-          <%= render partial: "timeline" %>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_processes/show.html.erb b/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_processes/show.html.erb
index d4f0d3f9bf2be..86980e7639bab 100644
--- a/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_processes/show.html.erb
+++ b/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_processes/show.html.erb
@@ -24,9 +24,11 @@
 <div class="participatory-space__container">
 
   <%= participatory_space_floating_help %>
+  <%= cell "decidim/participatory_processes/process_step", current_participatory_space, display_steps: params[:display_steps] %>
 
   <% active_content_blocks.each do |content_block| %>
     <% next unless content_block.manifest %>
+
     <%= cell content_block.manifest.cell, content_block %>
   <% end %>
 
diff --git a/decidim-participatory_processes/app/views/layouts/decidim/_process_header_steps.html.erb b/decidim-participatory_processes/app/views/layouts/decidim/_process_header_steps.html.erb
deleted file mode 100644
index 276af55e5263d..0000000000000
--- a/decidim-participatory_processes/app/views/layouts/decidim/_process_header_steps.html.erb
+++ /dev/null
@@ -1,37 +0,0 @@
-<% if participatory_process.steps.any? %>
-  <div class="columns mediumlarge-4">
-    <div class="process-header__phase">
-      <div class="process-header__progress">
-        <ol>
-          <% past_step = true %>
-          <% participatory_process.steps.each_with_index do |step, index| %>
-            <% if past_step %>
-              <li class="phase-item--past"><span></span></li>
-            <% else %>
-              <li><span></span></li>
-            <% end %>
-            <% past_step = false if step.active? %>
-          <% end %>
-        </ol>
-        <span class="phase-current"><%= t(".step", current: (participatory_process.active_step.position + 1), total: current_participatory_space.steps.count) %></span>
-      </div>
-      <div>
-        <span class="phase-title"><%= translated_attribute participatory_process.active_step.title %></span>
-        <span class="phase-date">
-          <%= participatory_space_helpers.step_dates participatory_process.active_step %>
-        </span>
-      </div>
-      <% cta_text = translated_attribute(participatory_process.active_step.cta_text) %>
-      <% if participatory_process.active_step.cta_path.present? && cta_text.present? %>
-        <%= link_to t(".view_steps"), decidim_participatory_processes.participatory_process_participatory_process_steps_path(current_participatory_space), class: "clear button secondary tiny show-for-medium" %>
-        <%= link_to(
-          cta_text,
-          step_cta_url(participatory_process),
-          class: "button small button--sc show-for-medium"
-        ) %>
-      <% else %>
-        <%= link_to t(".view_steps"), decidim_participatory_processes.participatory_process_participatory_process_steps_path(current_participatory_space) %>
-      <% end %>
-    </div>
-  </div>
-<% end %>
diff --git a/decidim-participatory_processes/config/locales/en.yml b/decidim-participatory_processes/config/locales/en.yml
index 5d41149ea2dd7..6120d6ea6a0a3 100644
--- a/decidim-participatory_processes/config/locales/en.yml
+++ b/decidim-participatory_processes/config/locales/en.yml
@@ -406,7 +406,6 @@ en:
     participatory_process_steps:
       index:
         process_steps: Process phases
-        title: Participatory process phases
     participatory_processes:
       admin:
         content_blocks:
@@ -536,8 +535,5 @@ en:
           more_info_about: More info about process %{resource_name}
           take_part: Take part
           take_part_in: Take part in process %{resource_name}
-      process_header_steps:
-        step: Phase %{current} of %{total}
-        view_steps: Process phases
       process_navigation:
         process_menu_item: The process
diff --git a/decidim-participatory_processes/lib/decidim/participatory_processes/engine.rb b/decidim-participatory_processes/lib/decidim/participatory_processes/engine.rb
index 2ebd2af531dbe..59ce273004b77 100644
--- a/decidim-participatory_processes/lib/decidim/participatory_processes/engine.rb
+++ b/decidim-participatory_processes/lib/decidim/participatory_processes/engine.rb
@@ -31,7 +31,6 @@ class Engine < ::Rails::Engine
         resources :participatory_process_groups, only: :show, path: "processes_groups"
         resources :participatory_processes, only: [:index, :show], param: :slug, path: "processes" do
           get "all-metrics", on: :member
-          resources :participatory_process_steps, only: [:index], path: "steps"
         end
 
         scope "/processes/:participatory_process_slug/f/:component_id" do
diff --git a/decidim-participatory_processes/spec/events/decidim/participatory_process_step_activated_event_spec.rb b/decidim-participatory_processes/spec/events/decidim/participatory_process_step_activated_event_spec.rb
index 60df4009f56b3..51355a130a3a1 100644
--- a/decidim-participatory_processes/spec/events/decidim/participatory_process_step_activated_event_spec.rb
+++ b/decidim-participatory_processes/spec/events/decidim/participatory_process_step_activated_event_spec.rb
@@ -12,13 +12,14 @@
   let(:participatory_space) { resource.participatory_process }
   let(:resource) { create(:participatory_process_step) }
   let(:resource_path) do
-    decidim_participatory_processes.participatory_process_participatory_process_steps_path(participatory_process_slug: participatory_process.slug)
+    decidim_participatory_processes.participatory_process_path(participatory_process, display_steps: true)
   end
 
   let(:resource_url) do
     decidim_participatory_processes
-      .participatory_process_participatory_process_steps_url(
-        participatory_process_slug: participatory_process.slug,
+      .participatory_process_url(
+        participatory_process,
+        display_steps: true,
         host: participatory_process.organization.host
       )
   end
diff --git a/decidim-participatory_processes/spec/events/decidim/participatory_process_step_changed_event_spec.rb b/decidim-participatory_processes/spec/events/decidim/participatory_process_step_changed_event_spec.rb
index 52243195b0ff7..2e48c4d20e0ca 100644
--- a/decidim-participatory_processes/spec/events/decidim/participatory_process_step_changed_event_spec.rb
+++ b/decidim-participatory_processes/spec/events/decidim/participatory_process_step_changed_event_spec.rb
@@ -12,13 +12,14 @@
   let(:participatory_space) { resource.participatory_process }
   let(:resource) { create(:participatory_process_step) }
   let(:resource_path) do
-    decidim_participatory_processes.participatory_process_participatory_process_steps_path(participatory_process_slug: participatory_process.slug)
+    decidim_participatory_processes.participatory_process_path(participatory_process, display_steps: true)
   end
 
   let(:resource_url) do
     decidim_participatory_processes
-      .participatory_process_participatory_process_steps_url(
-        participatory_process_slug: participatory_process.slug,
+      .participatory_process_url(
+        participatory_process,
+        display_steps: true,
         host: participatory_process.organization.host
       )
   end
diff --git a/decidim-participatory_processes/spec/system/participatory_process_steps_spec.rb b/decidim-participatory_processes/spec/system/participatory_process_steps_spec.rb
index 6025ea3c1b9ef..dc0b986fa72c9 100644
--- a/decidim-participatory_processes/spec/system/participatory_process_steps_spec.rb
+++ b/decidim-participatory_processes/spec/system/participatory_process_steps_spec.rb
@@ -15,8 +15,6 @@
   end
 
   before do
-    skip "REDESIGN_PENDING - Deprecated: Those tests, associated views, controllers and paths should be removed after fully enabling redesign. Equivalent test should be added to the content block which implements this feature"
-
     switch_to_host(organization.host)
   end
 
@@ -31,14 +29,14 @@
 
     it_behaves_like "accessible page" do
       before do
-        visit decidim_participatory_processes.participatory_process_participatory_process_steps_path(participatory_process)
+        visit decidim_participatory_processes.participatory_process_path(participatory_process, display_steps: true)
       end
     end
 
     it "lists all the steps" do
-      visit decidim_participatory_processes.participatory_process_participatory_process_steps_path(participatory_process)
+      visit decidim_participatory_processes.participatory_process_path(participatory_process, display_steps: true)
 
-      expect(page).to have_css(".timeline__item", count: 3)
+      expect(page).to have_css(".participatory-space__metadata-modal__step", count: 3)
       steps.each do |step|
         expect(page).to have_content(/#{translated(step.title)}/i)
       end

From 584bb2aecf9cadbf932fa4385dc774bcc6605c00 Mon Sep 17 00:00:00 2001
From: Hugoren Martinako <aumpfbahn@gmail.com>
Date: Fri, 28 Jul 2023 08:34:05 +0200
Subject: [PATCH 08/14] Redesign: comments issues (#11363)

* provide styles to links

* include hsah to comments link

* underline link

* add icon to show/hide replies
---
 .../cells/decidim/comments/comment/actions.erb   | 16 ++++++++--------
 .../decidim/comments/comment_cells_helper.rb     |  2 +-
 .../app/packs/stylesheets/comments.scss          |  6 ++++++
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/decidim-comments/app/cells/decidim/comments/comment/actions.erb b/decidim-comments/app/cells/decidim/comments/comment/actions.erb
index 6fc8ad49a98d1..6fd3214d1153c 100644
--- a/decidim-comments/app/cells/decidim/comments/comment/actions.erb
+++ b/decidim-comments/app/cells/decidim/comments/comment/actions.erb
@@ -1,4 +1,12 @@
 <div class="comment__actions">
+  <% if depth.zero? && has_replies_in_children? %>
+    <button class="button button__sm button__text-secondary comment__hide" data-controls="comment-<%= model.id %>-replies">
+      <%= icon "arrow-up-s-line" %>
+      <span class="hide-comment-replies font-normal"><%= t("decidim.components.comment.hide_replies") %></span>
+      <%= icon "arrow-down-s-line" %>
+      <span class="show-comment-replies font-normal"><%= t("decidim.components.comment.show_replies", count: replies.size, replies_count: replies.size ) %></span>
+    </button>
+  <% end %>
   <% if can_reply? %>
     <button class="button button__sm button__text-secondary" data-controls="panel-<%= reply_id %>">
       <%= icon "chat-1-line" %>
@@ -7,12 +15,4 @@
       <span class="font-normal"><%= t("decidim.components.comment.cancel_reply") %></span>
     </button>
   <% end %>
-  <% if depth.zero? && has_replies_in_children? %>
-    <button class="button button__sm button__text-secondary comment__hide" data-controls="comment-<%= model.id %>-replies">
-      <%= icon "comment-square" %>
-      <span class="hide-comment-replies font-normal"><%= t("decidim.components.comment.hide_replies") %></span>
-      <%= icon "comment-square" %>
-      <span class="show-comment-replies font-normal"><%= t("decidim.components.comment.show_replies", count: replies.size, replies_count: replies.size ) %></span>
-    </button>
-  <% end %>
 </div>
diff --git a/decidim-comments/app/helpers/decidim/comments/comment_cells_helper.rb b/decidim-comments/app/helpers/decidim/comments/comment_cells_helper.rb
index bb9ffb606e0c4..0041a81df8721 100644
--- a/decidim-comments/app/helpers/decidim/comments/comment_cells_helper.rb
+++ b/decidim-comments/app/helpers/decidim/comments/comment_cells_helper.rb
@@ -26,7 +26,7 @@ def root_commentable_title
       end
 
       def url_params
-        { commentId: comment.id }
+        { commentId: comment.id, anchor: "comment_#{comment.id}" }
       end
     end
   end
diff --git a/decidim-comments/app/packs/stylesheets/comments.scss b/decidim-comments/app/packs/stylesheets/comments.scss
index a64e3f2080dbb..09a4cca6b8deb 100644
--- a/decidim-comments/app/packs/stylesheets/comments.scss
+++ b/decidim-comments/app/packs/stylesheets/comments.scss
@@ -13,6 +13,10 @@
     .form__wrapper {
       @apply pt-0;
     }
+
+    a {
+      @apply text-secondary underline font-semibold;
+    }
   }
 
   &__header {
@@ -234,6 +238,8 @@
   }
 
   &__actions {
+    @apply flex items-center gap-4;
+
     .button[aria-expanded="false"] {
       svg:first-of-type {
         @apply block;

From 894d19ef9931dd59286bcee6505aee06f5ec37d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Pereira=20de=20Lucena?=
 <andreslucena@users.noreply.github.com>
Date: Fri, 28 Jul 2023 08:38:30 +0200
Subject: [PATCH 09/14] Alert from frontend errors in critical paths (#10937)

* Alert from frontend errors in critical paths

* Revert "Alert from frontend errors in critical paths"

This reverts commit b7fad871cfaab4f9def8f82cd0decb46c51de45f.

* Show a failure page when the vote errored

* Fix election feedback URL

* Fix eslint offense

* Use election_feedback_path with vote if there's any

* Fix show error message for the new show/hide API

---------

Co-authored-by: Txus Bach <me@txus.io>
---
 .../src/decidim/elections/voter/new-vote.js   | 127 +++++++++---------
 .../voter/vote_questions.component.js         |   5 +
 .../elections/votes/_show_failed.html.erb     |   6 +-
 .../decidim/elections/votes/new.html.erb      |   4 +
 4 files changed, 80 insertions(+), 62 deletions(-)

diff --git a/decidim-elections/app/packs/src/decidim/elections/voter/new-vote.js b/decidim-elections/app/packs/src/decidim/elections/voter/new-vote.js
index e1ecb5a718198..497930b0556e2 100644
--- a/decidim-elections/app/packs/src/decidim/elections/voter/new-vote.js
+++ b/decidim-elections/app/packs/src/decidim/elections/voter/new-vote.js
@@ -24,70 +24,75 @@ $(async () => {
       // Get the vote component and bind it to all UI events
       const voteComponent = component($voteWrapper);
 
-      await voteComponent.bindEvents({
-        onBindEncryptButton(onEventTriggered) {
-          $("[id='next-encrypting']").on("click", onEventTriggered);
-        },
-        onStart() {},
-        onVoteEncryption(validVoteFn) {
-          const getFormData = (formData) => {
-            return formData.serializeArray().reduce((acc, { name, value }) => {
-              if (!acc[name]) {
-                acc[name] = [];
-              }
-              acc[name] = [...acc[name], `${name}_${value}`];
-              return acc;
-            }, {});
-          };
-          const formData = getFormData($voteWrapper.find(".answer_input"));
-          validVoteFn(formData, ballotStyleId);
-        },
-        castOrAuditBallot({ encryptedData, encryptedDataHash }) {
-          $voteWrapper.find("#step-encrypting").attr("hidden", true);
-          $ballotHash.text(encryptedDataHash);
+      try {
+        await voteComponent.bindEvents({
+          onBindEncryptButton(onEventTriggered) {
+            $("[id='next-encrypting']").on("click", onEventTriggered);
+          },
+          onStart() {},
+          onVoteEncryption(validVoteFn) {
+            const getFormData = (formData) => {
+              return formData.serializeArray().reduce((acc, { name, value }) => {
+                if (!acc[name]) {
+                  acc[name] = [];
+                }
+                acc[name] = [...acc[name], `${name}_${value}`];
+                return acc;
+              }, {});
+            };
+            const formData = getFormData($voteWrapper.find(".answer_input"));
+            validVoteFn(formData, ballotStyleId);
+          },
+          castOrAuditBallot({ encryptedData, encryptedDataHash }) {
+            $voteWrapper.find("#step-encrypting").attr("hidden", true);
+            $ballotHash.text(encryptedDataHash);
 
-          // show the next step
-          $voteWrapper.find("#step-ballot_decision").attr("hidden", false);
-          // simulates a toggle click, in order to update the wizard step
-          document.dispatchEvent(new Event("on:toggle"));
+            // show the next step
+            $voteWrapper.find("#step-ballot_decision").attr("hidden", false);
+            // simulates a toggle click, in order to update the wizard step
+            document.dispatchEvent(new Event("on:toggle"));
 
-          const $form = $("form.new_vote");
-          $("#vote_encrypted_data", $form).val(encryptedData);
-          $("#vote_encrypted_data_hash", $form).val(encryptedDataHash);
-        },
-        onBindAuditBallotButton(onEventTriggered) {
-          $("#audit_ballot").on("click", onEventTriggered);
-        },
-        onBindCastBallotButton(onEventTriggered) {
-          $("#cast_ballot").on("click", onEventTriggered);
-        },
-        onAuditBallot(auditedData, auditedDataFileName) {
-          const vote = JSON.stringify(auditedData);
-          const link = document.createElement("a");
-          $voteWrapper.find("#cast_ballot").attr("hidden", true);
-          $voteWrapper.find("#back").attr("hidden", false);
-          questionsComponent.voteCasted = true;
+            const $form = $("form.new_vote");
+            $("#vote_encrypted_data", $form).val(encryptedData);
+            $("#vote_encrypted_data_hash", $form).val(encryptedDataHash);
+          },
+          onBindAuditBallotButton(onEventTriggered) {
+            $("#audit_ballot").on("click", onEventTriggered);
+          },
+          onBindCastBallotButton(onEventTriggered) {
+            $("#cast_ballot").on("click", onEventTriggered);
+          },
+          onAuditBallot(auditedData, auditedDataFileName) {
+            const vote = JSON.stringify(auditedData);
+            const link = document.createElement("a");
+            $voteWrapper.find("#cast_ballot").attr("hidden", true);
+            $voteWrapper.find("#back").attr("hidden", false);
+            questionsComponent.voteCasted = true;
 
-          link.setAttribute("href", `data:text/plain;charset=utf-8,${vote}`);
-          link.setAttribute("download", auditedDataFileName);
-          document.body.appendChild(link);
-          link.click();
-          document.body.removeChild(link);
-        },
-        onAuditComplete() {
-          console.log("Audit completed");
-        },
-        onCastBallot() {
-          questionsComponent.voteCasted = true;
-          $("#cast_ballot").prop("disabled", true);
-        },
-        onCastComplete() {
-          console.log("Cast completed");
-        },
-        onInvalid() {
-          console.log("Something went wrong.");
-        }
-      });
+            link.setAttribute("href", `data:text/plain;charset=utf-8,${vote}`);
+            link.setAttribute("download", auditedDataFileName);
+            document.body.appendChild(link);
+            link.click();
+            document.body.removeChild(link);
+          },
+          onAuditComplete() {
+            console.log("Audit completed");
+          },
+          onCastBallot() {
+            questionsComponent.voteCasted = true;
+            $("#cast_ballot").prop("disabled", true);
+          },
+          onCastComplete() {
+            console.log("Cast completed");
+          },
+          onInvalid() {
+            console.log("Something went wrong.");
+          }
+        });
+      } catch (error) {
+        console.error(error);
+        questionsComponent.errored();
+      }
     }
 
     if (isPreview) {
diff --git a/decidim-elections/app/packs/src/decidim/elections/voter/vote_questions.component.js b/decidim-elections/app/packs/src/decidim/elections/voter/vote_questions.component.js
index 4e3414361ee6d..7d6bf8c7ca332 100644
--- a/decidim-elections/app/packs/src/decidim/elections/voter/vote_questions.component.js
+++ b/decidim-elections/app/packs/src/decidim/elections/voter/vote_questions.component.js
@@ -35,6 +35,11 @@ export default class VoteQuestionsComponent {
     this.updateWizardSteps(this.$currentStep.attr("id"));
   }
 
+  errored() {
+    this.$currentStep.attr("hidden", true);
+    this.$currentStep = this.$voteWrapper.find("#failed").attr("hidden", false);
+  }
+
   toggleContinueButton() {
     // ignore the button if the step is not a question
     if (!this.isQuestion(this.$currentStep.attr("id"))) {
diff --git a/decidim-elections/app/views/decidim/elections/votes/_show_failed.html.erb b/decidim-elections/app/views/decidim/elections/votes/_show_failed.html.erb
index 28589bf672e7d..82f88c676b5b9 100644
--- a/decidim-elections/app/views/decidim/elections/votes/_show_failed.html.erb
+++ b/decidim-elections/app/views/decidim/elections/votes/_show_failed.html.erb
@@ -17,6 +17,10 @@
 
   <p class="election-question__description">
     <%= t("decidim.elections.votes.confirmed.experience") %>
-    <%= link_to t("decidim.elections.votes.confirmed.feedback"), election_feedback_path(election, hash: vote.encrypted_vote_hash, token: params[:token]) %>
+    <% if vote %>
+      <%= link_to t("decidim.elections.votes.confirmed.feedback"), election_feedback_path(election, hash: vote.encrypted_vote_hash, token: params[:token]) %>
+    <% else %>
+      <%= link_to t("decidim.elections.votes.confirmed.feedback"), election_feedback_path(election) %>
+    <% end %>
   </p>
 </div>
diff --git a/decidim-elections/app/views/decidim/elections/votes/new.html.erb b/decidim-elections/app/views/decidim/elections/votes/new.html.erb
index da65d56e689cc..232583744400f 100644
--- a/decidim-elections/app/views/decidim/elections/votes/new.html.erb
+++ b/decidim-elections/app/views/decidim/elections/votes/new.html.erb
@@ -80,6 +80,10 @@
     <div id="step-ballot_decision" hidden>
       <%= render("new_ballot_decision_step") %>
     </div>
+
+    <div id="failed" hidden>
+      <%= render("show_failed") %>
+    </div>
   </div>
 
   <%= render "decidim/elections/shared/broken_promises_modal" %>

From b6b024f7b093aeb97b1bded74792670b82fb8fc8 Mon Sep 17 00:00:00 2001
From: Alexandru Emil Lupu <contact@alecslupu.ro>
Date: Fri, 28 Jul 2023 09:57:46 +0300
Subject: [PATCH 10/14] Add videos services to CSP (youtube-nocookie.com,
 meet.jit.si, etc) (#11155)

* Fix content security policy

* Remove openstreetmap from CSP

* Apply review recommendations
---
 decidim-core/lib/decidim/content_security_policy.rb       | 2 +-
 .../controllers/concerns/content_security_policy_spec.rb  | 8 ++++----
 decidim-core/spec/lib/content_security_policy_spec.rb     | 2 +-
 decidim-meetings/lib/decidim/meetings/engine.rb           | 6 ++++++
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/decidim-core/lib/decidim/content_security_policy.rb b/decidim-core/lib/decidim/content_security_policy.rb
index d5a982b65d4ae..b771face4da73 100644
--- a/decidim-core/lib/decidim/content_security_policy.rb
+++ b/decidim-core/lib/decidim/content_security_policy.rb
@@ -123,7 +123,7 @@ def default_policy
         "img-src" => %w('self' *.hereapi.com data:),
         "font-src" => %w('self'),
         "connect-src" => %w('self' *.hereapi.com *.jsdelivr.net),
-        "frame-src" => %w('self'),
+        "frame-src" => %w('self' www.youtube-nocookie.com player.vimeo.com),
         "media-src" => %w('self')
       }
     end
diff --git a/decidim-core/spec/controllers/concerns/content_security_policy_spec.rb b/decidim-core/spec/controllers/concerns/content_security_policy_spec.rb
index 958b1e728fd28..c88a6675858ae 100644
--- a/decidim-core/spec/controllers/concerns/content_security_policy_spec.rb
+++ b/decidim-core/spec/controllers/concerns/content_security_policy_spec.rb
@@ -46,7 +46,7 @@ def show
         expect(response.headers["Content-Security-Policy"]).to include("img-src 'self' *.hereapi.com data: https://via.placeholder.com;")
         expect(response.headers["Content-Security-Policy"]).to include("connect-src 'self' *.hereapi.com *.jsdelivr.net;")
         expect(response.headers["Content-Security-Policy"]).to include("font-src 'self';")
-        expect(response.headers["Content-Security-Policy"]).to include("frame-src 'self';")
+        expect(response.headers["Content-Security-Policy"]).to include("frame-src 'self' www.youtube-nocookie.com player.vimeo.com;")
         expect(response.headers["Content-Security-Policy"]).to include("media-src 'self'")
       end
 
@@ -61,7 +61,7 @@ def show
           expect(response.headers["Content-Security-Policy"]).to include("img-src 'self' *.hereapi.com data: https://via.placeholder.com https://img.example.org;")
           expect(response.headers["Content-Security-Policy"]).to include("connect-src 'self' *.hereapi.com *.jsdelivr.net https://connect.example.org;")
           expect(response.headers["Content-Security-Policy"]).to include("font-src 'self' https://font.example.org;")
-          expect(response.headers["Content-Security-Policy"]).to include("frame-src 'self' https://frame.example.org;")
+          expect(response.headers["Content-Security-Policy"]).to include("frame-src 'self' www.youtube-nocookie.com player.vimeo.com https://frame.example.org;")
           expect(response.headers["Content-Security-Policy"]).to include("media-src 'self' https://example.org")
         end
       end
@@ -76,7 +76,7 @@ def show
           expect(response.headers["Content-Security-Policy"]).to include("img-src 'self' *.hereapi.com data: https://img.example.org;")
           expect(response.headers["Content-Security-Policy"]).to include("connect-src 'self' *.hereapi.com *.jsdelivr.net https://connect.example.org;")
           expect(response.headers["Content-Security-Policy"]).to include("font-src 'self' https://font.example.org;")
-          expect(response.headers["Content-Security-Policy"]).to include("frame-src 'self' https://frame.example.org;")
+          expect(response.headers["Content-Security-Policy"]).to include("frame-src 'self' www.youtube-nocookie.com player.vimeo.com https://frame.example.org;")
           expect(response.headers["Content-Security-Policy"]).to include("media-src 'self' https://example.org")
         end
       end
@@ -122,7 +122,7 @@ def show
           expect(response.headers["Content-Security-Policy"]).to include("img-src 'self' *.hereapi.com data: https://img.example.org https://via.placeholder.com;")
           expect(response.headers["Content-Security-Policy"]).to include("connect-src 'self' *.hereapi.com *.jsdelivr.net https://connect.example.org;")
           expect(response.headers["Content-Security-Policy"]).to include("font-src 'self' https://font.example.org;")
-          expect(response.headers["Content-Security-Policy"]).to include("frame-src 'self' https://frame.example.org;")
+          expect(response.headers["Content-Security-Policy"]).to include("frame-src 'self' www.youtube-nocookie.com player.vimeo.com https://frame.example.org;")
           expect(response.headers["Content-Security-Policy"]).to include("media-src 'self' https://example.org")
         end
       end
diff --git a/decidim-core/spec/lib/content_security_policy_spec.rb b/decidim-core/spec/lib/content_security_policy_spec.rb
index 3cbd0d2a1e73c..f87088121f47e 100644
--- a/decidim-core/spec/lib/content_security_policy_spec.rb
+++ b/decidim-core/spec/lib/content_security_policy_spec.rb
@@ -18,7 +18,7 @@ module Decidim
       it { expect(subject.output_policy).to include("img-src 'self' *.hereapi.com data:;") }
       it { expect(subject.output_policy).to include("connect-src 'self' *.hereapi.com *.jsdelivr.net;") }
       it { expect(subject.output_policy).to include("font-src 'self';") }
-      it { expect(subject.output_policy).to include("frame-src 'self';") }
+      it { expect(subject.output_policy).to include("frame-src 'self' www.youtube-nocookie.com player.vimeo.com;") }
       it { expect(subject.output_policy).to include("media-src 'self'") }
     end
 
diff --git a/decidim-meetings/lib/decidim/meetings/engine.rb b/decidim-meetings/lib/decidim/meetings/engine.rb
index 6edcb2a5b46bc..685a2cc3ab9df 100644
--- a/decidim-meetings/lib/decidim/meetings/engine.rb
+++ b/decidim-meetings/lib/decidim/meetings/engine.rb
@@ -50,6 +50,12 @@ class Engine < ::Rails::Engine
         end
       end
 
+      initializer "decidim_meetings.content_security_handlers" do |_app|
+        Decidim.configure do |config|
+          config.content_security_policies_extra.deep_merge!({ "frame-src" => %w(player.twitch.tv meet.jit.si) })
+        end
+      end
+
       initializer "decidim_meetings.view_hooks" do
         Decidim.view_hooks.register(:participatory_space_highlighted_elements, priority: Decidim::ViewHooks::HIGH_PRIORITY) do |view_context|
           view_context.cell("decidim/meetings/highlighted_meetings", view_context.current_participatory_space)

From 8389e5e96129fe3f1340b952dfa732b957b181e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Pereira=20de=20Lucena?=
 <andreslucena@users.noreply.github.com>
Date: Fri, 28 Jul 2023 10:01:19 +0200
Subject: [PATCH 11/14] Reorder and renumber the RELEASES_NOTES (#11379)

* Move 'Configuration parameter change' to 'Changes in APIs' section

* Add exception explanation on `decidim-consultations` removal instructions

* Move 'Note for development' explanation to the correct place

* Fix numerations of titles

* Fix timestamp in DB migration

Suggested by code review

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>

---------

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>
---
 RELEASE_NOTES.md | 111 +++++++++++++++++++++++++++++++++--------------
 1 file changed, 79 insertions(+), 32 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 1df5789bb293d..88e2160d2e846 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -23,15 +23,6 @@ bin/rails db:migrate
 
 ### 1.3. Follow the steps and commands detailed in these notes
 
-#### 1.3.1 Configuration parameter change
-
-Prior to 0.28, there was the possibility of configuring a list of disallowed passwords using the configuration parameter `Decidim.password_blacklist` or the environment variable `DECIDIM_PASSWORD_BLACKLIST`. These methods have been renamed as follows:
-
-- `Decidim.password_blacklist` becomes `Decidim.denied_passwords`
-- `DECIDIM_PASSWORD_BLACKLIST` becomes `DECIDIM_DENIED_PASSWORDS`
-
-You can read more about this change on PR [\#10288](https://github.com/decidim/decidim/pull/10288).
-
 ## 2. General notes
 
 ## 2.1. Redesign
@@ -50,6 +41,53 @@ If you're not using it, then you don't need to do anything.
 
 If you're maintaining a version of this module, please share the URL of the git repository by [creating an issue on the decidim.org website repository](https://github.com/decidim/decidim.org) so that we can update the [Modules page](https://decidim.org/modules).
 
+There's an error with the migrations after you've removed this module, you'd need to change them like this:
+
+### db/migrate/*_add_commentable_counter_cache_to_consultations.decidim_consultations.rb
+
+```ruby
+# frozen_string_literal: true
+# This migration comes from decidim_consultations (originally 20200827154143)
+
+class AddCommentableCounterCacheToConsultations < ActiveRecord::Migration[5.2]
+  class Question < ApplicationRecord
+    self.table_name = :decidim_consultations_questions
+  end
+
+  def change
+    add_column :decidim_consultations_questions, :comments_count, :integer, null: false, default: 0, index: true
+    Question.reset_column_information
+    Question.find_each(&:update_comments_count)
+  end
+end
+```
+
+### db/migrate/*_add_followable_counter_cache_to_consultations.decidim_consultations.rb
+
+```ruby
+# frozen_string_literal: true
+# This migration comes from decidim_consultations (originally 20210310120626)
+
+class AddFollowableCounterCacheToConsultations < ActiveRecord::Migration[5.2]
+  class Question < ApplicationRecord
+    self.table_name = :decidim_consultations_questions
+  end
+
+  def change
+    add_column :decidim_consultations_questions, :follows_count, :integer, null: false, default: 0, index: true
+
+    reversible do |dir|
+      dir.up do
+        Question.reset_column_information
+        Question.find_each do |record|
+          record.class.reset_counters(record.id, :follows)
+        end
+      end
+    end
+  end
+end
+```
+
 You can read more about this change on PR [#11171](https://github.com/decidim/decidim/pull/11171).
 
 ## 3. One time actions
@@ -100,7 +138,7 @@ In some other cases when you run your application on a custom port (other than 3
 
 You can read more about this change on PR [\#10519](https://github.com/decidim/decidim/pull/10519).
 
-### 3.3. User moderation panel changes
+### 3.4. User moderation panel changes
 
 In older Decidim installations, when blocking an user directly from the participants menu, without being previously reported, it will hide that user, making it unavailable in the Reported Participants section. You will need to run this command once to make sure there are no users or entities that got blocked but are not visible in the participants listing.
 
@@ -110,7 +148,7 @@ bundle exec rake decidim:upgrade:moderation:fix_blocked_user_panel
 
 You can read more about this change on PR [\#10521](https://github.com/decidim/decidim/pull/10521).
 
-### 3.4. Change Webpacker to Shakapacker
+### 3.5. Change Webpacker to Shakapacker
 
 Since the Rails team has retired the Webpacker in favour or importmap-rails or js-bundling, we got ouserlves in a situation where performance improvements could not be performed.
 In order to continue having support for Webpacker like syntax, we have switched to Shakapacker.
@@ -136,7 +174,23 @@ bundle exec rake decidim:webpacker:install
 
 This will make the necessary changes in the `config/webpacker.yml`, but also in the `config/webpack/` folder.
 
-### 3.5. Initialize content blocks on spaces or resources with landing page
+#### Note for development
+
+If you are using the `Procfile.dev` file, you will need to make sure that you have the following line in your configuration. If you have not altered the `Procfile.dev` file, you will not need to do anything, as we covered that part:
+
+```console
+webpacker: ./bin/webpacker-dev-server
+```
+
+In order to run your development server, you will need to run the following command:
+
+```console
+./bin/dev
+```
+
+You can read more about this change on PR [\#10389](https://github.com/decidim/decidim/pull/10389).
+
+### 3.6. Initialize content blocks on spaces or resources with landing page
 
 The processes and assemblies participatory spaces have changed the show page and now is composed using content blocks. For the new spaces created in this version a callback is executed creating the content blocks marked as `default!` in the engine for the corresponding homepage scope. To have the same initialization in the existing spaces there is a task to generate those blocks if not present already. Run the below command to generate default content blocks when not present for all spaces and resources with content blocks homepage (participatory processes, participatory process groups and assemblies):
 
@@ -156,29 +210,13 @@ For example, to generate the default content blocks and also the components bloc
 bundle exec rake decidim:content_blocks:initialize_default_content_blocks[,,true]
 ```
 
-#### Note for development
-
-If you are using the `Procfile.dev` file, you will need to make sure that you have the following line in your configuration. If you have not altered the `Procfile.dev` file, you will not need to do anything, as we covered that part:
-
-```console
-webpacker: ./bin/webpacker-dev-server
-```
-
-In order to run your development server, you will need to run the following command:
-
-```console
-./bin/dev
-```
-
-You can read more about this change on PR [\#10389](https://github.com/decidim/decidim/pull/10389).
-
-### 3.5. Graphql upgrade
+### 3.7. Graphql upgrade
 
 In [\#10606](https://github.com/decidim/decidim/pull/10606) we have upgraded the GraphQL gem to version 2.0.19. This upgrade introduces some breaking changes, so you will need to update your GraphQL queries to match the new API. This change should be transparent for most of the users, but if you have custom GraphQL queries, you will need to update them. Also, please note, there might be some issues with community plugins that offer support for GraphQL, so you might need to update them as well.
 
 Please see the [change log](https://github.com/rmosolgo/graphql-ruby/blob/master/CHANGELOG.md) for graphql gem for more information.
 
-### 3.6. Orphans valuator assignments cleanup
+### 3.8. Orphans valuator assignments cleanup
 
 We have added a new task that helps you clean the valuator assignements records of roles that have been deleted.
 
@@ -190,7 +228,7 @@ bundle exec rake decidim:proposals:upgrade:remove_valuator_orphan_records
 
 You can see more details about this change on PR [\#10607](https://github.com/decidim/decidim/pull/10607)
 
-### 3.7. Initiatives pages exception fix
+### 3.9. Initiatives pages exception fix
 
 We have added a new tasks to fix a bug related to the pages component inside of the Initiatives module (`decidim-initiatives`).
 
@@ -202,7 +240,7 @@ bundle exec rake decidim:initiatives:upgrade:fix_broken_pages
 
 You can see more details about this change on PR [\#10928](https://github.com/decidim/decidim/pull/10928)
 
-### 3.7. Add Content Security Policy (CSP) support
+### 3.10. Add Content Security Policy (CSP) support
 
 We have introduced support for Content Security Policy (CSP). This is a security feature that helps to detect and mitigate certain types of attacks, including Cross Site Scripting (XSS) and data injection attacks.
 By default, the CSP is enabled, and is configured to be as restrictive as possible, having the following default configuration:
@@ -659,3 +697,12 @@ end
 ```
 
 You can read more about this change at PR [\#10760](https://github.com/decidim/decidim/pull/10760).
+
+### 5.5. Configuration parameter change
+
+Prior to 0.28, there was the possibility of configuring a list of disallowed passwords using the configuration parameter `Decidim.password_blacklist` or the environment variable `DECIDIM_PASSWORD_BLACKLIST`. These methods have been renamed as follows:
+
+- `Decidim.password_blacklist` becomes `Decidim.denied_passwords`
+- `DECIDIM_PASSWORD_BLACKLIST` becomes `DECIDIM_DENIED_PASSWORDS`
+
+You can read more about this change on PR [\#10288](https://github.com/decidim/decidim/pull/10288).

From 6400355fd9089b413a2a59cca31a759cf4d69b44 Mon Sep 17 00:00:00 2001
From: Antti Hukkanen <antti.hukkanen@mainiotech.fi>
Date: Fri, 28 Jul 2023 15:20:53 +0300
Subject: [PATCH 12/14] Add links to useful accessibility resources to the a11y
 docs (#11401)

---
 docs/modules/develop/pages/guide_accessibility.adoc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/modules/develop/pages/guide_accessibility.adoc b/docs/modules/develop/pages/guide_accessibility.adoc
index 6bda7a63e15fd..848f84799cf22 100644
--- a/docs/modules/develop/pages/guide_accessibility.adoc
+++ b/docs/modules/develop/pages/guide_accessibility.adoc
@@ -16,6 +16,12 @@ Accessibility of websites is based on the https://www.w3.org/WAI/standards-guide
 
 These guidelines are constantly evolving and new versions can come out that may require changes in already implemented functionality. Some of the violations can be noticed automatically but others violations require a real person to test the website with the common assistive technologies used for browsing the internet (see the "Testing" section below).
 
+Accessibility is not only technical. The end results have to be well tested and audited by unbiased 3rd parties to ensure the best outcome. With the core development we aim to consider the following criteria for creating accessible user interfaces:
+
+. Technical accessibility using https://dequeuniversity.com/rules/axe/latest[Axe]
+. Perceived accessibility using latest version of https://www.w3.org/WAI/standards-guidelines/wcag/[the WCAG recommendations]
+. Cognitive accessibility using https://www.w3.org/WAI/WCAG2/supplemental/#cognitiveaccessibilityguidance[the WCAG Cognitive Accessibility Guidance] and the guide for https://www.w3.org/TR/coga-usable/[Making Content Usable for People with Cognitive and Learning Disabilities]
+
 === Common mistakes
 
 This section contains some common mistakes that developers tend to do regarding accessibility. These do not cover all of the things you need to consider regarding accessibility but we add common issues in this list as we notice them.

From 2dd4d728f9a36e754cb8ec2f67ac9bad11337da6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Pereira=20de=20Lucena?=
 <andreslucena@users.noreply.github.com>
Date: Fri, 28 Jul 2023 15:25:08 +0200
Subject: [PATCH 13/14] Add "Tile usage" notice at the top of doc page for OSM
 maps and geocoding (#11411)

* Add documentation link reference in initializer

* Add "Tile usage" notice at the top of doc page

* Apply suggestions from code review

---------

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>
---
 .../lib/decidim/generators/app_templates/initializer.rb   | 3 +++
 docs/modules/services/pages/maps.adoc                     | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/decidim-generators/lib/decidim/generators/app_templates/initializer.rb b/decidim-generators/lib/decidim/generators/app_templates/initializer.rb
index f6e08211d44a1..ed37a5f0d15b7 100644
--- a/decidim-generators/lib/decidim/generators/app_templates/initializer.rb
+++ b/decidim-generators/lib/decidim/generators/app_templates/initializer.rb
@@ -47,6 +47,9 @@
 
   # Map and Geocoder configuration
   #
+  # See Decidim docs at https://docs.decidim.org/en/develop/services/maps.html
+  # for more information about how it works and how to set it up.
+  #
   # == HERE Maps ==
   # config.maps = {
   #   provider: :here,
diff --git a/docs/modules/services/pages/maps.adoc b/docs/modules/services/pages/maps.adoc
index 262d2dbeb2d64..b820a0e39ffb4 100644
--- a/docs/modules/services/pages/maps.adoc
+++ b/docs/modules/services/pages/maps.adoc
@@ -1,6 +1,14 @@
 = Maps and geocoding
 
 Decidim has the ability to geocode proposals and meetings and display them on a map.
+
+[CAUTION]
+====
+It is important to notice that you cannot use the OpenStreetMap service from openstreetmap.org. As they mention in their https://operations.osmfoundation.org/policies/tiles/[tile usage policy]:
+
+> OpenStreetMap data is free for everyone to use. Our tile servers are not.
+====
+
 Decidim has built-in support for the following map service providers:
 
 * http://here.com[HERE Maps] (Recommended)

From 025fc4ffe2340de6086e224cc476017304acdce5 Mon Sep 17 00:00:00 2001
From: Alexandru Emil Lupu <contact@alecslupu.ro>
Date: Mon, 31 Jul 2023 09:46:47 +0300
Subject: [PATCH 14/14] Fix Failing specs (#11419)

---
 .../content_blocks/participatory_space_hero/show.erb      | 2 +-
 .../spec/cells/decidim/user_activity_cell_spec.rb         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/decidim-core/app/cells/decidim/content_blocks/participatory_space_hero/show.erb b/decidim-core/app/cells/decidim/content_blocks/participatory_space_hero/show.erb
index e6b7e5a3be2b6..d5df02555fde5 100644
--- a/decidim-core/app/cells/decidim/content_blocks/participatory_space_hero/show.erb
+++ b/decidim-core/app/cells/decidim/content_blocks/participatory_space_hero/show.erb
@@ -1,4 +1,4 @@
-<section id="hero-<%= resource&.id %>" <%= "style=\"background-image:url('#{image_path}');\"" if image_path.present? %>>
+<section id="hero-<%= resource&.id %>" <%= "style=\"background-image:url('#{image_path}');\"" if image_path.present? %> data-process-hero>
   <div class="participatory-space__hero">
     <div class="participatory-space__hero-text">
       <h1 class="h1 text-5xl">
diff --git a/decidim-core/spec/cells/decidim/user_activity_cell_spec.rb b/decidim-core/spec/cells/decidim/user_activity_cell_spec.rb
index 99029426a5578..4a65448ebedc9 100644
--- a/decidim-core/spec/cells/decidim/user_activity_cell_spec.rb
+++ b/decidim-core/spec/cells/decidim/user_activity_cell_spec.rb
@@ -76,7 +76,7 @@
   it "displays the latest items on the first page and a pagination" do
     logs.last(10).each do |log|
       root_link = Decidim::ResourceLocatorPresenter.new(log.resource.root_commentable).path
-      comment_link = "#{root_link}?commentId=#{log.resource.id}"
+      comment_link = "#{root_link}?commentId=#{log.resource.id}#comment_#{log.resource.id}"
       title = html_truncate(translated_attribute(log.resource.root_commentable.title), length: 80)
 
       expect(subject).to have_link(title, href: comment_link)
@@ -95,7 +95,7 @@
     it "displays the oldest items and a pagination" do
       logs.first(5).each do |log|
         root_link = Decidim::ResourceLocatorPresenter.new(log.resource.root_commentable).path
-        comment_link = "#{root_link}?commentId=#{log.resource.id}"
+        comment_link = "#{root_link}?commentId=#{log.resource.id}#comment_#{log.resource.id}"
         title = html_truncate(translated_attribute(log.resource.root_commentable.title), length: 80)
 
         expect(subject).to have_link(title, href: comment_link)
@@ -124,14 +124,14 @@
       # The first five items should be hidden through moderation
       logs.first(5).each do |log|
         root_link = Decidim::ResourceLocatorPresenter.new(log.resource.root_commentable).path
-        comment_link = "#{root_link}?commentId=#{log.resource.id}"
+        comment_link = "#{root_link}?commentId=#{log.resource.id}#comment_#{log.resource.id}"
         title = html_truncate(translated_attribute(log.resource.root_commentable.title), length: 80)
 
         expect(subject).not_to have_link(title, href: comment_link)
       end
       logs.last(10).each do |log|
         root_link = Decidim::ResourceLocatorPresenter.new(log.resource.root_commentable).path
-        comment_link = "#{root_link}?commentId=#{log.resource.id}"
+        comment_link = "#{root_link}?commentId=#{log.resource.id}#comment_#{log.resource.id}"
         title = html_truncate(translated_attribute(log.resource.root_commentable.title), length: 80)
 
         expect(subject).to have_link(title, href: comment_link)