diff --git a/app/views/admin/application/static/_design.html.erb b/app/views/admin/application/static/_design.html.erb
index 509ad3388b312444c8e34cee2a42b45cf431ac59..220982d70f7d6db7e6e4ed302f6436f2088bba00 100644
--- a/app/views/admin/application/static/_design.html.erb
+++ b/app/views/admin/application/static/_design.html.erb
@@ -6,9 +6,6 @@ toc_offcanvas = local_assigns.has_key?(:toc_offcanvas)  ? local_assigns[:toc_off
 toc_present = local_assigns.has_key?(:toc_present)      ? local_assigns[:toc_present]
                                                         : l10n.show_toc?
 %>
-<% # legacy, please remove when site migrated %>
-full_width: <%= full_width %>
-<% # end of legacy%>
 design:
   full_width: <%= full_width %>
   toc:
diff --git a/app/views/admin/communication/blocks/components/boolean/_edit.html.erb b/app/views/admin/communication/blocks/components/boolean/_edit.html.erb
index baf464e4a6820f2721379ecdef5f741d46625488..bdf510125c60dba0b3039e3a9d1cfdadbccf0e59 100644
--- a/app/views/admin/communication/blocks/components/boolean/_edit.html.erb
+++ b/app/views/admin/communication/blocks/components/boolean/_edit.html.erb
@@ -1,4 +1,4 @@
-<div class="form-check">
+<div class="form-check form-switch">
   <input  :id="<%= dom_id.html_safe %>"
           class="form-check-input"
           v-model="<%= model %>.<%= property %>"
diff --git a/app/views/admin/communication/blocks/templates/posts/_edit.html.erb b/app/views/admin/communication/blocks/templates/posts/_edit.html.erb
index 729b3fe76fa63b8018233d77a3add8a831c32cce..50d26366f2f6a2b7a8e82a580065e3da8bbd3481 100644
--- a/app/views/admin/communication/blocks/templates/posts/_edit.html.erb
+++ b/app/views/admin/communication/blocks/templates/posts/_edit.html.erb
@@ -7,7 +7,7 @@
     <%= block_component_edit block, :option_image, label: Communication::Website::Post::Localization.human_attribute_name(:featured_image) %>
     <%= block_component_edit block, :option_subtitle, label: Communication::Website::Post::Localization.human_attribute_name(:subtitle) %>
     <%= block_component_edit block, :option_summary, label: t('admin.summary.label') %>
-    <%= block_component_edit block, :option_author, label: Communication::Website::Post.human_attribute_name(:author) %>
+    <%= block_component_edit block, :option_author, label: Communication::Website::Post.human_attribute_name(:authors) %>
     <%= block_component_edit block, :option_date, label: Communication::Website::Post::Localization.human_attribute_name(:date) %>
     <%= block_component_edit block, :option_categories, label: Communication::Website::Post.human_attribute_name(:categories) %>
     <%= block_component_edit block, :option_reading_time, label: Communication::Website::Post::Localization.human_attribute_name(:reading_time) %>
diff --git a/app/views/admin/communication/websites/agenda/events/_form.html.erb b/app/views/admin/communication/websites/agenda/events/_form.html.erb
index 8ca620d72f4349add4d1355b4b8fa8eef1a9b10c..3ca8ba8eeb93e02b963eba091dc59deefbd78cf1 100644
--- a/app/views/admin/communication/websites/agenda/events/_form.html.erb
+++ b/app/views/admin/communication/websites/agenda/events/_form.html.erb
@@ -40,7 +40,8 @@
       </div>
       <div class="col-md-4">
         <%= osuny_panel t('metadata') do %>
-          <%= lf.input :published if can? :publish, event %>
+          <%= lf.input :published,
+                        wrapper: :custom_boolean_switch if can? :publish, event %>
           <%= render  "admin/application/slug/form",
                       f: lf,
                       source: '#communication_website_agenda_event_localizations_attributes_0_title' %>
diff --git a/app/views/admin/communication/websites/pages/_form.html.erb b/app/views/admin/communication/websites/pages/_form.html.erb
index 4b07e3bf94498c33552b5db1233818023c3216db..884c4e5f4d8448d65d189193f1a211be5967b028 100644
--- a/app/views/admin/communication/websites/pages/_form.html.erb
+++ b/app/views/admin/communication/websites/pages/_form.html.erb
@@ -30,7 +30,8 @@ url = page.new_record?  ? admin_communication_website_pages_path
       </div>
       <div class="col-md-4">
         <%= osuny_panel t('metadata') do %>
-          <%= lf.input :published if page.draftable? %>
+          <%= lf.input :published,
+                        wrapper: :custom_boolean_switch if page.draftable? %>
           <%= render  "admin/application/slug/form",
                       f: lf,
                       source: '#communication_website_page_localizations_attributes_0_title' unless page.is_home? %>
diff --git a/app/views/admin/communication/websites/portfolio/projects/_form.html.erb b/app/views/admin/communication/websites/portfolio/projects/_form.html.erb
index 7f304a6e783843bf1ae53c235c03216eb3012f0a..8d5db630d034ceb939ee5bf21d6b43c54a5db2fd 100644
--- a/app/views/admin/communication/websites/portfolio/projects/_form.html.erb
+++ b/app/views/admin/communication/websites/portfolio/projects/_form.html.erb
@@ -17,7 +17,8 @@
       </div>
       <div class="col-md-4">
         <%= osuny_panel t('metadata') do %>
-          <%= lf.input :published if can? :publish, project %>
+          <%= lf.input :published,
+                        wrapper: :custom_boolean_switch if can? :publish, project %>
           <%= f.input :year %>
           <%= render  "admin/application/slug/form",
                       f: lf,
diff --git a/app/views/admin/communication/websites/posts/_form.html.erb b/app/views/admin/communication/websites/posts/_form.html.erb
index befbf6f16c057ec925062ed27fed66f429638832..55b798a9a7ff99438497588617ccfe57b910ee20 100644
--- a/app/views/admin/communication/websites/posts/_form.html.erb
+++ b/app/views/admin/communication/websites/posts/_form.html.erb
@@ -21,10 +21,10 @@
           <% if can? :publish, post %>
             <div class="row pure__row--small">
               <div class="col-6">
-                <%= lf.input :published %>
+                <%= lf.input :published, wrapper: :custom_boolean_switch %>
               </div>
               <div class="col-6">
-                <%= lf.input :pinned %>
+                <%= lf.input :pinned, wrapper: :custom_boolean_switch %>
               </div>
             </div>
             <%= lf.input :published_at, html5: true, as: :date %>
@@ -42,7 +42,7 @@
           <%= render  "admin/application/slug/form",
                       f: lf,
                       source: '#communication_website_post_localizations_attributes_0_title' %>
-          <%= f.input :full_width %>
+          <%= f.input :full_width, wrapper: :custom_boolean_switch %>
         <% end %>
         <%= render 'admin/application/featured_image/edit', f: lf, about: @l10n %>
         <%= render 'admin/application/shared_image/edit', f: lf, about: @l10n %>