diff --git a/.rubocop.yml b/.rubocop.yml
index 13bc55c..928b486 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,94 +1,2 @@
 inherit_gem:
   decidim-dev: rubocop-decidim.yml
-
-inherit_mode:
-  merge:
-    - Exclude
-
-AllCops:
-  Exclude:
-    - "decidim-initiatives/lib/gem_overrides/origami/date.rb"
-
-Naming/FileName:
-  Exclude:
-    - "decidim-dev/lib/decidim-dev.rb"
-
-Metrics/CyclomaticComplexity:
-  Exclude:
-    - "decidim-admin/app/queries/decidim/admin/newsletter_recipients.rb"
-
-Metrics/ParameterLists:
-  Exclude:
-    - "decidim-core/lib/decidim/filter_form_builder.rb"
-
-Metrics/PerceivedComplexity:
-  Exclude:
-    - "decidim-admin/app/queries/decidim/admin/newsletter_recipients.rb"
-
-RSpec/DescribeClass:
-  Exclude:
-    - decidim-core/spec/lib/global_engines_spec.rb
-
-RSpec/EmptyExampleGroup:
-  Exclude:
-    - decidim-core/spec/lib/participatory_space_manifest_spec.rb
-
-RSpec/MultipleMemoizedHelpers:
-  Exclude:
-    - decidim-assemblies/spec/forms/assembly_form_spec.rb
-
-Rails/Output:
-  Exclude:
-    - lib/decidim/git_backport_manager.rb
-    - lib/decidim/github_manager/poster.rb
-    - decidim-core/lib/decidim/core.rb
-    - decidim-core/lib/decidim/component_manifest.rb
-    - decidim-core/lib/decidim/participatory_space_manifest.rb
-
-Rails/Exit:
-  Exclude:
-    - lib/decidim/git_backport_manager.rb
-
-RSpec/NoExpectationExample:
-  Exclude:
-    - decidim-admin/spec/system/participatory_space_private_user_spec.rb
-    - decidim-comments/spec/services/decidim/comments/comment_creation_spec.rb
-    - decidim-conferences/spec/cells/decidim/conferences/conference_speaker_cell_spec.rb
-    - decidim-core/spec/cells/decidim/date_range_cell_spec.rb
-    - decidim-core/spec/commands/decidim/unsubscribe_settings_spec.rb
-    - decidim-core/spec/controllers/registrations_controller_spec.rb
-    - decidim-core/spec/lib/importers/import_manifest_spec.rb
-    - decidim-core/spec/lib/map/geocoding_spec.rb
-    - decidim-core/spec/lib/participatory_space_manifest_spec.rb
-    - decidim-core/spec/services/decidim/events_manager_spec.rb
-    - decidim-core/spec/services/decidim/settings_change_spec.rb
-    - decidim-core/spec/services/decidim/zip_stream/zip_stream_writer_spec.rb
-    - decidim-core/spec/tasks/decidim_tasks_right_to_be_forgotten_spec.rb
-    - decidim-elections/spec/lib/tasks/decidim_election_generate_identification_keys_spec.rb
-    - decidim-elections/spec/lib/tasks/decidim_election_scheduled_tasks_spec.rb
-    - decidim-elections/spec/shared/vote_examples.rb
-    - decidim-elections/spec/system/key_ceremony_spec.rb
-    - decidim-elections/spec/system/vote_online_inside_a_voting_spec.rb
-    - decidim-initiatives/spec/system/admin/update_initiative_spec.rb
-    - decidim-initiatives/spec/system/initiative_signing_spec.rb
-    - decidim-meetings/spec/commands/admin/export_meeting_registrations_spec.rb
-    - decidim-meetings/spec/system/explore_meeting_directory_spec.rb
-    - decidim-meetings/spec/system/explore_meetings_spec.rb
-    - decidim-proposals/spec/lib/decidim/proposals/markdown_to_proposals_spec.rb
-    - decidim-proposals/spec/shared/import_proposals_examples.rb
-    - decidim-proposals/spec/shared/proposals_wizards_examples.rb
-    - decidim-proposals/spec/system/admin/admin_manages_participatory_texts_spec.rb
-    - decidim-proposals/spec/system/participatory_texts_spec.rb
-    - decidim-participatory_processes/spec/system/participatory_processes_spec.rb
-
-# fix these rules later
-Capybara/SpecificFinders:
-  Enabled: false
-
-RSpec/IndexedLet:
-  Enabled: false
-
-Rails/HelperInstanceVariable:
-  Enabled: false
-
-# EOF fix these rules later
diff --git a/app/controllers/concerns/decidim/privacy/account_controller_extensions.rb b/app/controllers/concerns/decidim/privacy/account_controller_extensions.rb
deleted file mode 100644
index 07a03a6..0000000
--- a/app/controllers/concerns/decidim/privacy/account_controller_extensions.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-# The following changes are related to "Ask old password for changing email/password(PR #11737)"
-# These changes should be removed once it has been backported to v.27
-module Decidim
-  module Privacy
-    module AccountControllerExtensions
-      extend ActiveSupport::Concern
-      included do
-        def show
-          enforce_permission_to(:show, :user, current_user: current_user)
-          @account = form(AccountForm).from_model(current_user)
-          @account.password = nil
-        end
-
-        def update
-          enforce_permission_to(:update, :user, current_user: current_user)
-          @account = form(AccountForm).from_params(account_params)
-          UpdateAccount.call(current_user, @account) do
-            on(:ok) do |email_is_unconfirmed|
-              flash[:notice] = if email_is_unconfirmed
-                                 t("account.update.success_with_email_confirmation", scope: "decidim")
-                               else
-                                 t("account.update.success", scope: "decidim")
-                               end
-
-              bypass_sign_in(current_user)
-              redirect_to account_path(locale: current_user.reload.locale)
-            end
-
-            on(:invalid) do |password|
-              fetch_entered_password(password)
-              flash[:alert] = t("account.update.error", scope: "decidim")
-              render action: :show
-            end
-          end
-        end
-
-        private
-
-        def fetch_entered_password(password)
-          @account.password = password
-        end
-      end
-    end
-  end
-end
diff --git a/app/controllers/concerns/decidim/privacy/application_controller_extensions.rb b/app/controllers/concerns/decidim/privacy/application_controller_extensions.rb
index 586f2e2..f77c8fd 100644
--- a/app/controllers/concerns/decidim/privacy/application_controller_extensions.rb
+++ b/app/controllers/concerns/decidim/privacy/application_controller_extensions.rb
@@ -13,12 +13,10 @@ module ApplicationControllerExtensions
 
       def privacy_modal_snippets
         return unless respond_to?(:snippets)
-        return if current_user && current_user.public?
 
-        snippets.add(:foot, helpers.javascript_pack_tag("decidim_account_publish_handler"))
-        return unless user_signed_in?
-
-        snippets.add(:foot, helpers.cell("decidim/privacy/publish_account_modal", current_user))
+        if current_user && !current_user.public? && user_signed_in?
+          snippets.add(:foot, helpers.cell("decidim/privacy/publish_account_modal", current_user))
+        end
       end
     end
   end
diff --git a/app/controllers/concerns/decidim/privacy/profiles_controller_extensions.rb b/app/controllers/concerns/decidim/privacy/profiles_controller_extensions.rb
index 241edac..a340dd0 100644
--- a/app/controllers/concerns/decidim/privacy/profiles_controller_extensions.rb
+++ b/app/controllers/concerns/decidim/privacy/profiles_controller_extensions.rb
@@ -9,7 +9,6 @@ module ProfilesControllerExtensions
         before_action :add_nofollow_meta_tag
 
         def show
-          return redirect_to profile_timeline_path(nickname: params[:nickname]) if profile_holder == current_user
           return redirect_to profile_members_path if profile_holder.is_a?(Decidim::UserGroup)
           raise ActionController::RoutingError, "Not Found" if profile_holder.published_at.nil?
 
diff --git a/app/views/decidim/account/_old_password_field.html.erb b/app/views/decidim/account/_old_password_field.html.erb
deleted file mode 100644
index 41e5e4b..0000000
--- a/app/views/decidim/account/_old_password_field.html.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<%
-old_password_options = {
-  autocomplete: "current-password",
-  required: true
-}
-old_password_options[:help_text] = t("devise.passwords.edit.old_password_help") if local_assigns.has_key?(:show_help_text) && show_help_text
-%>
-<div class="columns small-12 end radius margin-top-3 <%= "hide" unless local_assigns.has_key?(:unhide)  %>" id="old_password_field" data-toggler=".hide">
-  <%= form.password_field :old_password, **old_password_options %>
-</div>
diff --git a/app/views/decidim/account/_password_fields.html.erb b/app/views/decidim/account/_password_fields.html.erb
deleted file mode 100644
index 5fd3007..0000000
--- a/app/views/decidim/account/_password_fields.html.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="user-password form__wrapper">
-  <% if local_assigns.has_key?(:show_help_text) || local_assigns.has_key?(:user) %>
-    <%= form.password_field :password, password_field_options_for(user) %>
-    <%= form.password_field :password_confirmation, password_field_options_for(user).except(:help_text) %>
-  <% else %>
-    <%= form.password_field :password, autocomplete: "current-password", required: true %>
-    <%= form.password_field :password_confirmation, password_field_options_for(user).except(:help_text) %>
-  <% end %>
-</div>
diff --git a/app/views/decidim/account/show.html.erb b/app/views/decidim/account/show.html.erb
index 2d66f81..a8800da 100644
--- a/app/views/decidim/account/show.html.erb
+++ b/app/views/decidim/account/show.html.erb
@@ -1,26 +1,30 @@
-<%= alert_box("", "account-notification hide", true) %>
 <% add_decidim_page_title(t("profile", scope: "layouts.decidim.user_menu")) %>
 <% content_for(:subtitle) { t("profile", scope: "layouts.decidim.user_menu") } %>
 
-<div class="row">
-  <%= decidim_form_for(@account, url: account_path, method: :put, html: { autocomplete: "on" }) do |f| %>
-    <div class="columns large-4">
-      <%= f.upload :avatar %>
+<%= render layout: "layouts/decidim/shared/layout_user_profile" do %>
+  <% if current_user.unconfirmed_email.present? %>
+    <%# NOTE: announcement cell clean_body method will purge the button %>
+    <div id="email-change-pending" class="flash warning" data-announcement>
+      <div class="flash__message flex-none block leading-relaxed">
+        <p>
+          <strong><%= t("decidim.account.email_change.title") %></strong>
+        </p>
+        <p>
+          <%= t("decidim.account.email_change.body1", unconfirmed_email: current_user.unconfirmed_email) %>
+        </p>
+        <p>
+          <%== t(
+            "decidim.account.email_change.body2",
+            resend_link: link_to(t("decidim.account.email_change.send_again"), resend_confirmation_instructions_account_path, role: :button, method: :post, remote: true),
+            cancel_link: link_to(t("decidim.account.email_change.cancel"), cancel_email_change_account_path, role: :button, method: :post, remote: true)) %>
+        </p>
+      </div>
     </div>
+  <% end %>
 
-    <div class="columns large-8 end">
-      <% if current_user.unconfirmed_email.present? %>
-        <div id="email-change-pending" class="callout secondary">
-          <p><strong><%= t("decidim.account.email_change.title") %></strong></p>
-          <p><%= t("decidim.account.email_change.body1", unconfirmed_email: current_user.unconfirmed_email) %></p>
-          <p>
-            <%== t(
-              "decidim.account.email_change.body2",
-              resend_link: link_to(t("decidim.account.email_change.send_again"), resend_confirmation_instructions_account_path, role: :button, method: :post, remote: true),
-              cancel_link: link_to(t("decidim.account.email_change.cancel"), cancel_email_change_account_path, role: :button, method: :post, remote: true)) %>
-          </p>
-        </div>
-      <% end %>
+  <%= decidim_form_for(@account, url: account_path, method: :put, html: { autocomplete: "on", class: "form-defaults edit_user" }) do |f| %>
+    <div class="form__wrapper pt-0">
+      <%= f.upload :avatar, button_class: "button button__lg button__transparent-secondary w-full" %>
 
       <%= form_required_explanation %>
 
@@ -34,27 +38,37 @@
             :locale,
             @account.organization.available_locales,
             :to_s,
-            ->(locale) {locale_name(locale) }
+            ->(locale) { locale_name(locale) },
+            help_text: t("available_locales_helper", scope:"decidim.account.show")
           ) %>
-      <p class="help-text"><%= t(".available_locales_helper") %></p>
-
-      <% if @account.errors[:password].any? || @account.errors[:password_confirmation].any? || @account.errors[:old_password].any?%>
+      <% if @account.password.present? %>
         <%= render partial: "password_fields", locals: { form: f, user: current_user } %>
-        <%= render partial: "old_password_field", locals: { form: f, show_help_text: true, unhide: false } %>
-      <% else %>
-        <% if current_organization.sign_in_enabled? %>
-          <p>
-            <button type="button" data-toggle="passwordChange" class="link change-password"><%= t ".change_password" %></button>
-          </p>
-          <div id="passwordChange" class="toggle-show" data-toggler=".is-expanded">
+        <%= render partial: "old_password_field", locals: { form: f, show_help_text: true } %>
+      <% elsif current_organization.sign_in_enabled? %>
+        <div data-component="accordion" id="accordion-password">
+          <%= button_tag(
+            class: "text-lg font-semibold text-secondary underline block cursor-pointer",
+            id: "accordion-trigger-panel-password",
+            type: "button",
+            data: { controls: "panel-password" }
+          ) do %>
+            <%= t("change_password", scope:"decidim.account.show") %>
+          <% end %>
+          <div id="panel-password" class="mt-6">
             <%= render partial: "password_fields", locals: { form: f, user: current_user } %>
           </div>
+        </div>
+
+        <%= content_tag :div, id: "panel-old-password", class: @account.errors[:old_password].any? ? nil : "hidden" do %>
           <%= render partial: "old_password_field", locals: { form: f, show_help_text: true } %>
         <% end %>
       <% end %>
 
-      <%= f.submit t(".update_account") %>
+      <div class="form__wrapper-block flex-col-reverse md:flex-row justify-between">
+        <%= f.submit t("update_account", scope:"decidim.account.show"), class: "button button__sm md:button__lg button__secondary mr-auto !ml-0" %>
+      </div>
     </div>
   <% end %>
-</div>
+<% end %>
+
 <%= append_javascript_pack_tag("decidim_privacy_user_form")%>
diff --git a/app/views/decidim/notifications_settings/show.html.erb b/app/views/decidim/notifications_settings/show.html.erb
index c5b609a..a8c2ac2 100644
--- a/app/views/decidim/notifications_settings/show.html.erb
+++ b/app/views/decidim/notifications_settings/show.html.erb
@@ -1,77 +1,162 @@
-<% add_decidim_page_title(t("notifications_settings", scope: "layouts.decidim.user_profile")) %>
-<% content_for(:subtitle) { t("notifications_settings", scope: "layouts.decidim.user_profile") } %>
-
-<%= form_for(@notifications_settings, url: notifications_settings_path, method: :put, class: "user-form") do |f| %>
-  <p><strong><%= t(".receive_notifications_about") %></strong></p>
-  <div class="switch tiny switch-with-label notifications_from_own_activity">
-    <%= f.label :notifications_from_own_activity do %>
-      <%= f.check_box :notifications_from_own_activity, label: false, class: "switch-input" %>
-      <span class="switch-paddle"></span>
-      <span class="switch-label"><%= t(".own_activity") %></span>
-    <% end %>
-  </div>
-  <div class="switch tiny switch-with-label notifications_from_followed">
-    <%= f.label :notifications_from_followed do %>
-      <%= f.check_box :notifications_from_followed, label: false, class: "switch-input" %>
-      <span class="switch-paddle"></span>
-      <span class="switch-label"><%= t(".everything_followed") %></span>
-    <% end %>
-  </div>
-
-  <p><strong><%= t(".notifications_sending_frequency") %></strong></p>
-  <%= f.collection_radio_buttons :notifications_sending_frequency, frequencies_collection, :first, :last, { checked: @notifications_settings.notifications_sending_frequency || "daily" } %>
-
-  <p><strong><%= t(".newsletters") %></strong></p>
-  <div class="switch tiny switch-with-label newsletter_notifications">
-    <label>
-      <%= f.check_box :newsletter_notifications, label: false, class: "switch-input" %>
-      <span class="switch-paddle"></span>
-      <span class="switch-label"><%= t(".newsletter_notifications") %></span>
-    </label>
-  </div>
+<%= render layout: "layouts/decidim/shared/layout_user_profile" do %>
+  <% add_decidim_page_title(t("notifications_settings", scope: "layouts.decidim.user_profile")) %>
+  <% content_for(:subtitle) { t("notifications_settings", scope: "layouts.decidim.user_profile") } %>
 
+  <%= form_for(@notifications_settings, url: notifications_settings_path, method: :put) do |f| %>
+    <div class="form__wrapper pt-0">
+      <label>
+        <%= t("receive_notifications_about", scope: "decidim.notifications_settings.show") %>
+      </label>
+      <div class="space-y-4">
+        <div class="toggle__switch-trigger">
+          <label for="notifications_from_own_activity" class="toggle__switch-toggle">
+            <span>
+              <input
+                <%== %(checked="checked") if @notifications_settings.notifications_from_own_activity %>
+                id="notifications_from_own_activity"
+                type="checkbox"
+                name="notifications_from_own_activity">
+              <span class="toggle__switch-toggle-content">
+              </span>
+              <%= icon "check-line", class: "toggle__switch-toggle-icon" %>
+              <%= icon "close-line", class: "toggle__switch-toggle-icon" %>
+            </span>
+            <span class="toggle__switch-trigger-text">
+              <%= t("own_activity", scope: "decidim.notifications_settings.show") %>
+            </span>
+          </label>
+        </div>
+        <div class="toggle__switch-trigger">
+          <label for="notifications_from_followed" class="toggle__switch-toggle">
+            <span>
+              <input
+                <%== %(checked="checked") if @notifications_settings.notifications_from_followed %>
+                id="notifications_from_followed"
+                type="checkbox"
+                name="notifications_from_followed">
+              <span class="toggle__switch-toggle-content">
+              </span>
+              <%= icon "check-line", class: "toggle__switch-toggle-icon" %>
+              <%= icon "close-line", class: "toggle__switch-toggle-icon" %>
+            </span>
+            <span class="toggle__switch-trigger-text">
+              <%= t("everything_followed", scope: "decidim.notifications_settings.show") %>
+            </span>
+          </label>
+        </div>
+      </div>
 
-  <% if current_user.moderator? %>
-    <p><strong><%= t(".administrators") %></strong></p>
-    <div class="switch tiny switch-with-label email_on_moderations">
       <label>
-        <%= f.check_box :email_on_moderations, label: false, class: "switch-input" %>
-        <span class="switch-paddle"></span>
-        <span class="switch-label"><%= t(".email_on_moderations") %></span>
+        <%= t("notifications_sending_frequency", scope: "decidim.notifications_settings.show") %>
       </label>
-    </div>
+      <div class="flex flex-col md:flex-row md:items-center gap-x-6">
+        <%= f.collection_radio_buttons :notifications_sending_frequency, frequencies_collection, :first, :last do |option|
+        option.label(class: "form__wrapper-checkbox-label first-of-type:mt-0 md:first-of-type:-mt-4 md:-mt-4 text-black") { option.radio_button + option.text }
+      end %>
+      </div>
 
-    <% Decidim.notification_settings_registry.manifests.filter{ |a| a.settings_area == :administrators }.each do |manifest| %>
-      <div class="switch tiny switch-with-label notification_settings">
-        <label>
-          <%= f.check_box "notification_settings[#{manifest.name}]",
-                          checked: ["1", true].include?(current_user.notification_settings.fetch(manifest.name.to_s, manifest.default_value)),
-                          label: false,
-                          class: "switch-input" %>
-          <span class="switch-paddle"></span>
-          <span class="switch-label"><%= t(".notification_settings.#{manifest.name}") %></span>
+      <label>
+        <%= t("newsletters", scope: "decidim.notifications_settings.show") %>
+      </label>
+      <div class="toggle__switch-trigger">
+        <label for="newsletter_notifications" class="toggle__switch-toggle">
+          <span>
+            <input
+              <%== %(checked="checked") if @notifications_settings.newsletter_notifications %>
+              id="newsletter_notifications"
+              type="checkbox"
+              name="newsletter_notifications">
+            <span class="toggle__switch-toggle-content">
+            </span>
+            <%= icon "check-line", class: "toggle__switch-toggle-icon" %>
+            <%= icon "close-line", class: "toggle__switch-toggle-icon" %>
+          </span>
+          <span class="toggle__switch-trigger-text">
+            <%= t("newsletter_notifications", scope: "decidim.notifications_settings.show") %>
+          </span>
         </label>
       </div>
-    <% end %>
 
-  <% end %>
-
-  <% if @notifications_settings.meet_push_notifications_requirements? %>
-    <div class="push-notifications js-sw-mandatory">
-      <p><strong><%= t(".push_notifications") %></strong></p>
-      <p id="push-notifications-reminder" class="push-notifications__reminder"><i><%= t(".push_notifications_reminder") %></i></p>
-      <div class="switch tiny switch-with-label allow_push_notifications">
+      <% if current_user.moderator? %>
         <label>
-          <%= check_box_tag :allow_push_notifications, 0, false, class: "switch-input" %>
-          <span class="switch-paddle"></span>
-          <span class="switch-label"><%= t(".allow_push_notifications") %></span>
+          <%= t("administrators", scope: "decidim.notifications_settings.show") %>
         </label>
+        <div class="space-y-4">
+          <div class="toggle__switch-trigger">
+            <label for="email_on_moderations" class="toggle__switch-toggle">
+              <span>
+                <input
+                  <%== %(checked="checked") if @notifications_settings.email_on_moderations %>
+                  id="email_on_moderations"
+                  type="checkbox"
+                  name="email_on_moderations">
+                <span class="toggle__switch-toggle-content">
+                </span>
+                <%= icon "check-line", class: "toggle__switch-toggle-icon" %>
+                <%= icon "close-line", class: "toggle__switch-toggle-icon" %>
+              </span>
+              <span class="toggle__switch-trigger-text">
+                <%= t("email_on_moderations", scope: "decidim.notifications_settings.show") %>
+              </span>
+            </label>
+          </div>
+          <% Decidim.notification_settings_registry.manifests.filter { |a| a.settings_area == :administrators }.each do |manifest| %>
+            <div class="toggle__switch-trigger">
+              <label class="toggle__switch-toggle" for="user_notification_settings[<%= manifest.name %>]">
+                <span>
+                  <%= f.check_box "notification_settings[#{manifest.name}]",
+                                  checked: ["1", true].include?(current_user.notification_settings.fetch(manifest.name.to_s, manifest.default_value)),
+                                  label: false,
+                                  class: "switch-input" %>
+                  <span class="toggle__switch-toggle-content">
+                  </span>
+                  <%= icon "check-line", class: "toggle__switch-toggle-icon" %>
+                  <%= icon "close-line", class: "toggle__switch-toggle-icon" %>
+                </span>
+                <span class="toggle__switch-trigger-text">
+                  <%= t("notification_settings.#{manifest.name}", scope: "decidim.notifications_settings.show") %>
+                </span>
+              </label>
+            </div>
+          <% end %>
+        </div>
+      <% end %>
+
+      <% if @notifications_settings.meet_push_notifications_requirements? %>
+        <div class="push-notifications js-sw-mandatory">
+          <label>
+            <%= t("push_notifications", scope: "decidim.notifications_settings.show") %>
+          </label>
+          <p id="push-notifications-reminder" class="push-notifications__reminder block my-4">
+            <%= t("push_notifications_reminder", scope: "decidim.notifications_settings.show") %>
+          </p>
+          <div class="toggle__switch-trigger">
+            <label class="toggle__switch-toggle" for="allow_push_notifications">
+              <span>
+                <input
+                  <%== %(checked="checked") if @notifications_settings.meet_push_notifications_requirements? %>
+                  id="allow_push_notifications"
+                  type="checkbox"
+                  name="allow_push_notifications">
+                <span class="toggle__switch-toggle-content">
+                </span>
+                <%= icon "check-line", class: "toggle__switch-toggle-icon" %>
+                <%= icon "close-line", class: "toggle__switch-toggle-icon" %>
+              </span>
+              <span class="toggle__switch-trigger-text">
+                <%= t("allow_push_notifications", scope: "decidim.notifications_settings.show") %>
+              </span>
+            </label>
+          </div>
+        </div>
+
+        <input id="vapidPublicKey" name="vapid_public_key" type="hidden" value="<%= Base64.urlsafe_decode64(Rails.application.secrets.vapid[:public_key]).bytes %>">
+        <input id="subKeys" name="sub_key" type="hidden" value="<%= current_user.notifications_subscriptions.keys %>">
+      <% end %>
+
+      <div class="form__wrapper-block">
+        <%= f.submit t("update_notifications_settings", scope: "decidim.notifications_settings.show"), class: "button button__sm md:button__lg button__secondary mr-auto !ml-0" %>
       </div>
     </div>
-
-    <input id="vapidPublicKey" name="vapid_public_key" type="hidden" value="<%= Base64.urlsafe_decode64(Rails.application.secrets.vapid[:public_key]).bytes %>">
-    <input id="subKeys" name="sub_key" type="hidden" value="<%= current_user.notifications_subscriptions.keys %>">
   <% end %>
-
-  <%= f.submit t(".update_notifications_settings") %>
 <% end %>
diff --git a/app/views/decidim/privacy/message_block.html.erb b/app/views/decidim/privacy/message_block.html.erb
index baf1d0c..86a1c41 100644
--- a/app/views/decidim/privacy/message_block.html.erb
+++ b/app/views/decidim/privacy/message_block.html.erb
@@ -1,6 +1,6 @@
 <div class="wrapper">
-  <div class="row collapse">
-    <div class="row collapse">
+  <div class="row">
+    <div class="row">
       <div class="columns large-8 large-centered text-center page-title">
         <h1><%= t(".title") %></h1>
       </div>
diff --git a/app/views/decidim/privacy/privacy_block.html.erb b/app/views/decidim/privacy/privacy_block.html.erb
index 7a97267..8666c88 100644
--- a/app/views/decidim/privacy/privacy_block.html.erb
+++ b/app/views/decidim/privacy/privacy_block.html.erb
@@ -1,6 +1,6 @@
 <div class="wrapper">
-  <div class="row collapse">
-    <div class="row collapse">
+  <div class="row">
+    <div class="row">
       <div class="columns large-8 large-centered text-center page-title">
         <h1><%= t(".title") %></h1>
       </div>
diff --git a/app/views/decidim/privacy/privacy_settings/show.html.erb b/app/views/decidim/privacy/privacy_settings/show.html.erb
index 255a4a6..f112cd7 100644
--- a/app/views/decidim/privacy/privacy_settings/show.html.erb
+++ b/app/views/decidim/privacy/privacy_settings/show.html.erb
@@ -1,32 +1,83 @@
-<% add_decidim_page_title(t("privacy_settings", scope: "layouts.decidim.user_profile")) %>
-<% content_for(:subtitle) { t("privacy_settings", scope: "layouts.decidim.user_profile") } %>
-<%= form_for(@privacy_settings, url: privacy_settings_path, method: :put, class: "user-form") do |f| %>
-  <%= t(".profile_publicity_html") %>
-  <div class="switch tiny switch-with-label notifications_from_followed">
-    <%= f.label :published_at do %>
-      <%= f.check_box :published_at, data:{ publicity: @privacy_settings.published_at }, label: false, class: "switch-input" %>
-      <span class="switch-paddle"></span>
-      <span class="switch-label"><%= t(".enable_public_profile") %></span>
-    <% end %>
-  </div>
-  <div id="toggle-privacy-messaging" class="hide margin-top-2">
-    <%= t(".private_messaging_html") %>
-    <div class="switch tiny switch-with-label notifications_from_followed">
-      <%= f.label :allow_private_messaging do %>
-        <%= f.check_box :allow_private_messaging, label: false, class: "switch-input" %>
-        <span class="switch-paddle"></span>
-        <span class="switch-label"><%= t(".enable_private_messaging") %></span>
-      <% end %>
+<%= render layout: "layouts/decidim/shared/layout_user_profile" do %>
+  <% add_decidim_page_title(t("privacy_settings", scope: "layouts.decidim.user_profile")) %>
+  <% content_for(:subtitle) { t("privacy_settings", scope: "layouts.decidim.user_profile") } %>
+
+  <%= form_for(@privacy_settings, url: privacy_settings_path, method: :put, class: "user-form") do |f| %>
+    <%= t("profile_publicity_html", scope: "decidim.privacy.privacy_settings.show") %>
+    <div class="form__wrapper pt-4">
+      <label>
+        <%= t("enable_public_profile", scope: "decidim.privacy.privacy_settings.show") %>
+      </label>
+      <div>
+        <div class="toggle__switch-trigger">
+          <label for="published_at" class="toggle__switch-toggle">
+            <span>
+              <input
+                <%== %(checked="checked") if @privacy_settings.published_at %>
+                id="published_at"
+                type="checkbox"
+                name="published_at">
+              <span class="toggle__switch-toggle-content">
+              </span>
+              <%= icon "check-line", class: "toggle__switch-toggle-icon" %>
+              <%= icon "close-line", class: "toggle__switch-toggle-icon" %>
+            </span>
+            <span class="toggle__switch-trigger-text">
+              <%= t("public_profile", scope: "decidim.privacy.privacy_settings.show") %>
+            </span>
+          </label>
+        </div>
+      </div>
     </div>
 
-    <div class="switch tiny switch-with-label allow_public_contact">
+    <div id="toggle-privacy-messaging" class="hide form__wrapper">
+      <%= t("private_messaging_html", scope: "decidim.privacy.privacy_settings.show") %>
+
+      <label>
+        <%= t("enable_private_messaging", scope: "decidim.privacy.privacy_settings.show") %>
+      </label>
+      <div class="toggle__switch-trigger">
+        <label for="allow_private_messaging" class="toggle__switch-toggle">
+          <span>
+            <input
+              <%== %(checked="checked") if @privacy_settings.allow_private_messaging %>
+              id="allow_private_messaging"
+              type="checkbox"
+              name="allow_private_messaging">
+            <span class="toggle__switch-toggle-content">
+            </span>
+            <%= icon "check-line", class: "toggle__switch-toggle-icon" %>
+            <%= icon "close-line", class: "toggle__switch-toggle-icon" %>
+          </span>
+          <span class="toggle__switch-trigger-text">
+            <%= t("private_messaging", scope: "decidim.privacy.privacy_settings.show") %>
+          </span>
+        </label>
+      </div>
+
       <label>
-        <%= f.check_box :allow_public_contact, label: false, class: "switch-input" %>
-        <span class="switch-paddle"></span>
-        <span class="switch-label"><%= t(".allow_public_contact") %></span>
+        <%= t("allow_public_contact", scope: "decidim.privacy.privacy_settings.show") %>
       </label>
+      <div class="toggle__switch-trigger">
+        <label for="allow_public_contact" class="toggle__switch-toggle">
+          <span>
+            <input
+              <%== %(checked="checked") if @privacy_settings.allow_public_contact %>
+              id="allow_public_contact"
+              type="checkbox"
+              name="allow_public_contact">
+            <span class="toggle__switch-toggle-content">
+            </span>
+            <%= icon "check-line", class: "toggle__switch-toggle-icon" %>
+            <%= icon "close-line", class: "toggle__switch-toggle-icon" %>
+          </span>
+          <span class="toggle__switch-trigger-text">
+            <%= t("public_contact", scope: "decidim.privacy.privacy_settings.show") %>
+          </span>
+        </label>
+      </div>
     </div>
-  </div>
-  <%= f.submit t(".save_privacy_settings") %>
+    <%= f.submit t(".save_privacy_settings"), class: "button button__sm md:button__lg button__secondary mr-auto !ml-0" %>
+  <% end %>
+  <%= append_javascript_pack_tag "decidim_privacy_settings" %>
 <% end %>
-<%= append_javascript_pack_tag "decidim_privacy_settings" %>
diff --git a/app/views/layouts/decidim/_decidim_javascript.html.erb b/app/views/layouts/decidim/_decidim_javascript.html.erb
new file mode 100644
index 0000000..d0aab6d
--- /dev/null
+++ b/app/views/layouts/decidim/_decidim_javascript.html.erb
@@ -0,0 +1,20 @@
+<%# NOTE: for performance reasons defer this javascript call would be good, although there are references to jquery that need to be reviewed %>
+
+<% if current_user && !current_user.public? %>
+  <% snippets.add(:foot, append_javascript_pack_tag("decidim_account_publish_handler")) %>
+<% end %>
+
+<% if Decidim.service_worker_enabled %>
+  <%= javascript_pack_tag "decidim_core","decidim_sw", defer: false %>
+<% else %>
+  <%= javascript_pack_tag "decidim_core", defer: false %>
+<% end %>
+
+<%= render partial: "layouts/decidim/js_configuration" %>
+
+<%= yield :js_content %>
+
+<%= snippets.display(:foot) %>
+
+<%= render partial: "layouts/decidim/cors" if Decidim.cors_enabled %>
+
diff --git a/app/views/layouts/decidim/_user_menu.html.erb b/app/views/layouts/decidim/_user_menu.html.erb
index f7f4bf1..5fcb8ca 100644
--- a/app/views/layouts/decidim/_user_menu.html.erb
+++ b/app/views/layouts/decidim/_user_menu.html.erb
@@ -1,5 +1,5 @@
 <li role="presentation"><%= link_to t(".profile"), decidim.account_path, role: "menuitem" %></li>
-<% if current_user.nickname.present? && !current_user.managed? && current_user.published_at.present? %>
+<% if current_user.nickname.present? && !current_user.managed? %>
   <li role="presentation"><%= link_to t(".public_profile"), decidim.profile_path(current_user.nickname), role: "menuitem" %></li>
 <% end %>
 <li role="presentation"><%= link_to t(".notifications"), decidim.notifications_path, role: "menuitem" %></li>
@@ -9,4 +9,4 @@
 <% if allowed_to? :read, :admin_dashboard %>
   <li role="presentation"><%= link_to t(".admin_dashboard"), decidim_admin.root_path, role: "menuitem" %></li>
 <% end %>
-<li role="presentation"><%= link_to t(".sign_out"), decidim.destroy_user_session_path, method: :delete, class: "sign-out-link", role: "menuitem" %></li>
+<li role="presentation"><%= link_to t(".log_out"), decidim.destroy_user_session_path, method: :delete, class: "sign-out-link", role: "menuitem" %></li>
diff --git a/app/views/layouts/decidim/_wrapper.html.erb b/app/views/layouts/decidim/_wrapper.html.erb
deleted file mode 100644
index d7a3567..0000000
--- a/app/views/layouts/decidim/_wrapper.html.erb
+++ /dev/null
@@ -1,118 +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: current_participatory_space
-  )
-end
-%>
-
-<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).url, 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 %>
-                  <% unless current_user.private_or_no_messaging? %>
-                    <%= 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 %>
-                  <% 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>
-
-        <main id="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>
-    </div>
-  </div>
-</div>
diff --git a/app/views/layouts/decidim/footer/_main_links.html.erb b/app/views/layouts/decidim/footer/_main_links.html.erb
new file mode 100644
index 0000000..ea781b5
--- /dev/null
+++ b/app/views/layouts/decidim/footer/_main_links.html.erb
@@ -0,0 +1,29 @@
+<%= footer_menu.render %>
+
+<nav role="navigation" aria-label="<%= t("layouts.decidim.footer.resources") %>">
+  <h2 class="h4 mb-4"><%= t("layouts.decidim.footer.resources") %></h2>
+  <ul class="space-y-4 break-inside-avoid">
+    <li class="font-semibold underline"><%= link_to t("decidim.profiles.show.activity"), decidim.last_activities_path %></li>
+    <li class="font-semibold underline"><%= link_to t("decidim.pages.home.extended.meetings"), Decidim::Meetings::DirectoryEngine.routes.url_helpers.root_path %></li>
+    <li class="font-semibold underline"><%= link_to t("layouts.decidim.footer.download_open_data"), decidim.open_data_download_path %></li>
+  </ul>
+</nav>
+
+<nav role="navigation" aria-label="<%= t("layouts.decidim.user_menu.profile") %>">
+  <h2 class="h4 mb-4"><%= t("layouts.decidim.user_menu.profile") %></h2>
+  <ul class="space-y-4 break-inside-avoid">
+    <% if current_user %>
+      <li class="font-semibold underline"><%= link_to t("layouts.decidim.user_menu.configuration"), decidim.account_path %></li>
+      <li class="font-semibold underline"><%= link_to t("layouts.decidim.user_menu.public_profile"), decidim.profile_path(current_user.nickname) %></li>
+      <li class="font-semibold underline"><%= link_to t("layouts.decidim.user_menu.notifications"), decidim.notifications_path %></li>
+      <% unless current_user.private_or_no_messaging? %>
+        <li class="font-semibold underline"><%= link_to t("layouts.decidim.user_menu.conversations"), decidim.conversations_path %></li>
+      <% end %>
+    <% else %>
+      <% if current_organization.sign_up_enabled? %>
+        <li class="font-semibold underline"><%= link_to t("layouts.decidim.footer.sign_up"), decidim.new_user_registration_path %></li>
+      <% end %>
+      <li class="font-semibold underline"><%= link_to t("layouts.decidim.footer.log_in"), decidim.new_user_session_path %></li>
+    <% end %>
+  </ul>
+</nav>
diff --git a/app/views/layouts/decidim/header/_main_links_dropdown.html.erb b/app/views/layouts/decidim/header/_main_links_dropdown.html.erb
new file mode 100644
index 0000000..20b756f
--- /dev/null
+++ b/app/views/layouts/decidim/header/_main_links_dropdown.html.erb
@@ -0,0 +1,47 @@
+<% unread_data ||= current_user_unread_data %>
+<li>
+  <%= link_to decidim.account_path, class: "dropdown__item" do %>
+    <%= icon "user-smile-line" %>
+    <span class="text-secondary"><%= t("layouts.decidim.user_menu.profile") %></span>
+  <% end %>
+</li>
+<li>
+  <%= link_to decidim.profile_path(current_user.nickname), class: "dropdown__item" do %>
+    <%= icon "account-circle-line" %>
+    <span class="text-secondary"><%= t("layouts.decidim.user_menu.public_profile") %></span>
+  <% end %>
+</li>
+<li>
+  <%= link_to decidim.notifications_path, class: "dropdown__item" do %>
+    <%= icon "notification-3-line" %>
+    <span class="text-secondary"><%= t("layouts.decidim.user_menu.notifications") %></span>
+    <% if unread_data[:unread_notifications] %>
+      <%= content_tag :span, "", class: "main-bar__dropdown-notification", data: unread_data %>
+    <% end %>
+  <% end %>
+</li>
+<% unless current_user.private_or_no_messaging? %>
+  <li>
+    <%= link_to decidim.conversations_path, class: "dropdown__item" do %>
+      <%= icon "mail-send-line" %>
+      <span class="text-secondary"><%= t("layouts.decidim.user_menu.conversations") %></span>
+      <% if unread_data[:unread_conversations] %>
+        <%= content_tag :span, "", class: "main-bar__dropdown-notification", data: unread_data %>
+      <% end %>
+    <% end %>
+  </li>
+<% end %>
+<% if allowed_to? :read, :admin_dashboard %>
+  <li>
+    <%= link_to decidim_admin.root_path, class: "dropdown__item" do %>
+      <%= icon "dashboard-line" %>
+      <span class="text-secondary"><%= t("layouts.decidim.user_menu.admin_dashboard") %></span>
+    <% end %>
+  </li>
+<% end %>
+<li>
+  <%= link_to decidim.destroy_user_session_path, method: :delete, class: "dropdown__item" do %>
+    <%= icon "logout-box-r-line" %>
+    <span class="text-secondary"><%= t("layouts.decidim.user_menu.log_out") %></span>
+  <% end %>
+</li>
diff --git a/app/views/layouts/decidim/user_profile.html.erb b/app/views/layouts/decidim/user_profile.html.erb
index 92e0183..4be0ddc 100644
--- a/app/views/layouts/decidim/user_profile.html.erb
+++ b/app/views/layouts/decidim/user_profile.html.erb
@@ -1,50 +1,21 @@
 <% subtitle = content_for(:subtitle) %>
 
 <%= render "layouts/decidim/application" do %>
-<% if controller_name == "privacy_settings" && current_user.public? || controller_name == "account" && current_user.public? %>
-  <div class="callout secondary">
-    <div class="row margin-bottom-1">
-      <div class="columns small-12">
-        <%= icon "information", class: "icon--big margin-right-1 private-icon", role: "img", "aria-hidden": true %>
-        <div class="h5 display-inline"><strong><%= t(".public") %></strong></div>
-      </div>
-    </div>
-    <div class="row">
-      <div class="columns small-12">
-        <p><%= t(".message") %></p>
-        <%= link_to request.base_url + decidim.profile_path(current_user.nickname), decidim.profile_path(current_user.nickname) %>
-      </div>
-    </div>
-  </div>
-<% end %>
-  <div class="wrapper">
-    <div class="row collapse">
-      <div class="columns">
-        <h1 class="heading1 user-header">
-          <%= t("title", scope: "layouts.decidim.user_profile") %>
-          <%= " - #{subtitle}" unless subtitle.blank? %>
-        </h1>
+  <% if controller_name == "privacy_settings" && current_user.public? || controller_name == "account" && current_user.public? %>
+    <div class="callout secondary">
+      <div class="row margin-bottom-1">
+        <div class="columns small-12">
+          <%= icon "information-line", class: "icon--big margin-right-1 private-icon", role: "img", "aria-hidden": true %>
+          <div class="h5 display-inline"><strong><%= t(".public") %></strong></div>
+        </div>
       </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 class="row">
+        <div class="columns small-12">
+          <p><%= t(".message") %></p>
+          <%= link_to request.base_url + decidim.profile_path(current_user.nickname), decidim.profile_path(current_user.nickname) %>
         </div>
       </div>
     </div>
-  </div>
+  <% end %>
+  <%= yield %>
 <% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c0b3060..a01034a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -41,8 +41,8 @@ en:
               These privacy settings allow you to control how you appear on this platform publicly. You can decide to
               remain completely anonymous but it will limit what you can do on this platform.
             </p>
-            <h2 class="heading5 h5">Profile publicity</h2>
-            <p>
+            <h2 class="heading3 h3 pt-4">Profile publicity</h2>
+            <p class="pt-4">
               Making your profile public allows you to perform public activities on this platform, such as sending
               comments, participating in discussions, creating proposals, etc.
             </p>
@@ -52,17 +52,20 @@ en:
               activity on this platform, your followers and who you follow.
             </p>
           private_messaging_html: |
-            <h2 class="heading5 h5">Private messaging</h2>
-            <p>
+            <h2 class="heading3 h3">Private messaging</h2>
+            <p class="pt-2">
               These settings allow you to communicate with other participants on this platform. Other participants can
               send you private messages and you can send them to others as well. Your profile needs to be public in
               order to enable this feature because other people need to find you on this platform in order to have a
               conversation with you.
             </p>
           enable_public_profile: Enable public profile
+          public_profile: I want my profile to be public to other users
           enable_private_messaging: Enable private messaging
+          private_messaging: I want to be able to message other public users
           save_privacy_settings: Save privacy settings
-          allow_public_contact: Allow anyone to send me a direct message, even if I do not follow them.
+          allow_public_contact: Allow public contact
+          public_contact: Allow anyone to send me a direct message, even if I do not follow them.
         update:
           error: There was a problem updating your privacy settings.
           success: Your privacy settings were successfully updated.
diff --git a/lib/decidim/privacy/engine.rb b/lib/decidim/privacy/engine.rb
index aa15f7e..f12f61e 100644
--- a/lib/decidim/privacy/engine.rb
+++ b/lib/decidim/privacy/engine.rb
@@ -133,9 +133,6 @@ class Engine < ::Rails::Engine
           Decidim::OwnUserGroupsController.include(
             Decidim::Privacy::OwnUserGroupsControllerExtensions
           )
-          # The following changes are related to "Ask old password for changing email/password(PR #11737)"
-          # These changes should be removed once it has been backported to v.27
-          Decidim::AccountController.include(Decidim::Privacy::AccountControllerExtensions)
 
           # models
           Decidim::ActionLog.include(Decidim::Privacy::ActionLogExtensions)