diff --git a/assets/css/src/components-form-editor/_preview.scss b/assets/css/src/components-form-editor/_preview.scss
index e89191b999..4f98813289 100644
--- a/assets/css/src/components-form-editor/_preview.scss
+++ b/assets/css/src/components-form-editor/_preview.scss
@@ -97,11 +97,3 @@
     }
   }
 }
-
-.mailpoet-toggle-list {
-  display: grid;
-  font-size: 13px;
-  grid-row-gap: 20px;
-  grid-template-columns: 1fr 45px;
-  margin-bottom: 1em;
-}
diff --git a/assets/js/src/form_editor/components/preview/below_posts_settings.tsx b/assets/js/src/form_editor/components/preview/below_posts_settings.tsx
index 1ac929d73c..03fba62909 100644
--- a/assets/js/src/form_editor/components/preview/below_posts_settings.tsx
+++ b/assets/js/src/form_editor/components/preview/below_posts_settings.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import MailPoet from 'mailpoet';
-import Toggle from 'common/toggle';
 import { useSelect, useDispatch } from '@wordpress/data';
+import { ToggleControl } from '@wordpress/components';
 import { partial } from 'lodash';
 import { SizeSettings } from 'form_editor/components/size_settings';
 
@@ -20,28 +20,16 @@ const BelowPostsSettings = () => {
 
   return (
     <>
-      <div className="mailpoet-toggle-list">
-        <div className="mailpoet-toggle-list-description">
-          {MailPoet.I18n.t('placeFormBellowAllPages')}
-        </div>
-        <div className="mailpoet-toggle-list-toggle">
-          <Toggle
-            name="placeFormBellowAllPages"
-            checked={formSettings.placeFormBellowAllPages || false}
-            onCheck={partial(updateSettings, 'placeFormBellowAllPages')}
-          />
-        </div>
-        <div className="mailpoet-toggle-list-description">
-          {MailPoet.I18n.t('placeFormBellowAllPosts')}
-        </div>
-        <div className="mailpoet-toggle-list-toggle" data-automation-id="place-form-bellow-all-posts-toggle">
-          <Toggle
-            name="placeFormBellowAllPosts"
-            checked={formSettings.placeFormBellowAllPosts || false}
-            onCheck={partial(updateSettings, 'placeFormBellowAllPosts')}
-          />
-        </div>
-      </div>
+      <ToggleControl
+        label={MailPoet.I18n.t('placeFormOnAllPages')}
+        checked={formSettings.placeFormBellowAllPages || false}
+        onChange={partial(updateSettings, 'placeFormBellowAllPages')}
+      />
+      <ToggleControl
+        label={MailPoet.I18n.t('placeFormOnAllPosts')}
+        checked={formSettings.placeFormBellowAllPosts || false}
+        onChange={partial(updateSettings, 'placeFormBellowAllPosts')}
+      />
       <SizeSettings
         label={MailPoet.I18n.t('formSettingsWidth')}
         value={formSettings.belowPostStyles.width}
diff --git a/assets/js/src/form_editor/components/preview/fixed_bar_settings.tsx b/assets/js/src/form_editor/components/preview/fixed_bar_settings.tsx
index 0fb97044bf..ca63319d05 100644
--- a/assets/js/src/form_editor/components/preview/fixed_bar_settings.tsx
+++ b/assets/js/src/form_editor/components/preview/fixed_bar_settings.tsx
@@ -1,8 +1,7 @@
 import React from 'react';
 import MailPoet from 'mailpoet';
-import Toggle from 'common/toggle';
 import { useSelect, useDispatch } from '@wordpress/data';
-import { SelectControl, RadioControl } from '@wordpress/components';
+import { SelectControl, RadioControl, ToggleControl } from '@wordpress/components';
 import { partial } from 'lodash';
 import { SizeSettings } from 'form_editor/components/size_settings';
 
@@ -29,28 +28,16 @@ const FixedBarSettings = () => {
   return (
     <>
       <p>{MailPoet.I18n.t('placeFixedBarFormOnPagesDescription')}</p>
-      <div className="mailpoet-toggle-list">
-        <div className="mailpoet-toggle-list-description">
-          {MailPoet.I18n.t('placeFormBellowAllPages')}
-        </div>
-        <div className="mailpoet-toggle-list-toggle">
-          <Toggle
-            name="placeFixedBarFormOnAllPages"
-            checked={formSettings.placeFixedBarFormOnAllPages || false}
-            onCheck={partial(updateSettings, 'placeFixedBarFormOnAllPages')}
-          />
-        </div>
-        <div className="mailpoet-toggle-list-description">
-          {MailPoet.I18n.t('placeFormBellowAllPosts')}
-        </div>
-        <div className="mailpoet-toggle-list-toggle">
-          <Toggle
-            name="placeFixedBarFormOnAllPosts"
-            checked={formSettings.placeFixedBarFormOnAllPosts || false}
-            onCheck={partial(updateSettings, 'placeFixedBarFormOnAllPosts')}
-          />
-        </div>
-      </div>
+      <ToggleControl
+        label={MailPoet.I18n.t('placeFormOnAllPages')}
+        checked={formSettings.placeFixedBarFormOnAllPages || false}
+        onChange={partial(updateSettings, 'placeFixedBarFormOnAllPages')}
+      />
+      <ToggleControl
+        label={MailPoet.I18n.t('placeFormOnAllPosts')}
+        checked={formSettings.placeFixedBarFormOnAllPosts || false}
+        onChange={partial(updateSettings, 'placeFixedBarFormOnAllPosts')}
+      />
       <SelectControl
         label={MailPoet.I18n.t('formPlacementDelay')}
         value={fixedBarFormDelay}
diff --git a/assets/js/src/form_editor/components/preview/popup_settings.tsx b/assets/js/src/form_editor/components/preview/popup_settings.tsx
index 13cf2a11b1..8be43520aa 100644
--- a/assets/js/src/form_editor/components/preview/popup_settings.tsx
+++ b/assets/js/src/form_editor/components/preview/popup_settings.tsx
@@ -1,7 +1,6 @@
-import React, { useState } from 'react';
+import React from 'react';
 import MailPoet from 'mailpoet';
-import Toggle from 'common/toggle';
-import { SelectControl } from '@wordpress/components';
+import { SelectControl, ToggleControl } from '@wordpress/components';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { partial } from 'lodash';
 import { SizeSettings } from 'form_editor/components/size_settings';
@@ -28,28 +27,16 @@ const PopUpSettings = () => {
   return (
     <>
       <p>{MailPoet.I18n.t('placePopupFormOnPagesDescription')}</p>
-      <div className="mailpoet-toggle-list">
-        <div className="mailpoet-toggle-list-description">
-          {MailPoet.I18n.t('placeFormBellowAllPages')}
-        </div>
-        <div className="mailpoet-toggle-list-toggle">
-          <Toggle
-            name="placePopupFormOnAllPages"
-            checked={formSettings.placePopupFormOnAllPages || false}
-            onCheck={partial(updateSettings, 'placePopupFormOnAllPages')}
-          />
-        </div>
-        <div className="mailpoet-toggle-list-description">
-          {MailPoet.I18n.t('placeFormBellowAllPosts')}
-        </div>
-        <div className="mailpoet-toggle-list-toggle">
-          <Toggle
-            name="placePopupFormOnAllPosts"
-            checked={formSettings.placePopupFormOnAllPosts || false}
-            onCheck={partial(updateSettings, 'placePopupFormOnAllPosts')}
-          />
-        </div>
-      </div>
+      <ToggleControl
+        label={MailPoet.I18n.t('placeFormOnAllPages')}
+        checked={formSettings.placePopupFormOnAllPages || false}
+        onChange={partial(updateSettings, 'placePopupFormOnAllPages')}
+      />
+      <ToggleControl
+        label={MailPoet.I18n.t('placeFormOnAllPosts')}
+        checked={formSettings.placePopupFormOnAllPosts || false}
+        onChange={partial(updateSettings, 'placePopupFormOnAllPosts')}
+      />
       <SelectControl
         label={MailPoet.I18n.t('formPlacementDelay')}
         value={popupFormDelay}
diff --git a/assets/js/src/form_editor/components/preview/slide_in_settings.tsx b/assets/js/src/form_editor/components/preview/slide_in_settings.tsx
index 17ea63bbae..8cd92d0afe 100644
--- a/assets/js/src/form_editor/components/preview/slide_in_settings.tsx
+++ b/assets/js/src/form_editor/components/preview/slide_in_settings.tsx
@@ -1,8 +1,7 @@
 import React from 'react';
 import MailPoet from 'mailpoet';
-import Toggle from 'common/toggle';
 import { useSelect, useDispatch } from '@wordpress/data';
-import { SelectControl, RadioControl } from '@wordpress/components';
+import { SelectControl, RadioControl, ToggleControl } from '@wordpress/components';
 import { partial } from 'lodash';
 import { SizeSettings } from 'form_editor/components/size_settings';
 
@@ -29,28 +28,16 @@ const SlideInSettings = () => {
   return (
     <>
       <p>{MailPoet.I18n.t('placeSlideInFormOnPagesDescription')}</p>
-      <div className="mailpoet-toggle-list">
-        <div className="mailpoet-toggle-list-description">
-          {MailPoet.I18n.t('placeFormBellowAllPages')}
-        </div>
-        <div className="mailpoet-toggle-list-toggle">
-          <Toggle
-            name="placeSlideInFormOnAllPages"
-            checked={formSettings.placeSlideInFormOnAllPages || false}
-            onCheck={partial(updateSettings, 'placeSlideInFormOnAllPages')}
-          />
-        </div>
-        <div className="mailpoet-toggle-list-description">
-          {MailPoet.I18n.t('placeFormBellowAllPosts')}
-        </div>
-        <div className="mailpoet-toggle-list-toggle">
-          <Toggle
-            name="placeSlideInFormOnAllPosts"
-            checked={formSettings.placeSlideInFormOnAllPosts || false}
-            onCheck={partial(updateSettings, 'placeSlideInFormOnAllPosts')}
-          />
-        </div>
-      </div>
+      <ToggleControl
+        label={MailPoet.I18n.t('placeFormOnAllPages')}
+        checked={formSettings.placeSlideInFormOnAllPages || false}
+        onChange={partial(updateSettings, 'placeSlideInFormOnAllPages')}
+      />
+      <ToggleControl
+        label={MailPoet.I18n.t('placeFormOnAllPosts')}
+        checked={formSettings.placeSlideInFormOnAllPosts || false}
+        onChange={partial(updateSettings, 'placeSlideInFormOnAllPosts')}
+      />
       <SelectControl
         label={MailPoet.I18n.t('formPlacementDelay')}
         value={slideInFormDelay}
diff --git a/tests/acceptance/DisplayFormBellowPostCest.php b/tests/acceptance/DisplayFormBellowPostCest.php
index 65a429abcf..c209d60d80 100644
--- a/tests/acceptance/DisplayFormBellowPostCest.php
+++ b/tests/acceptance/DisplayFormBellowPostCest.php
@@ -35,8 +35,8 @@ class DisplayFormBellowPostCest {
     $i->waitForElement('[data-automation-id="form_title_input"]');
     $i->click('.form-sidebar-form-placement-panel');
     $i->click('[data-automation-id="form-placement-option-Below pages"]');
-    $i->waitForElement('[data-automation-id="place-form-bellow-all-posts-toggle"]');
-    $i->checkOption('[data-automation-id="place-form-bellow-all-posts-toggle"]');
+    $i->waitForText('Display on all pages', 10, '.mailpoet_preview_sidebar');
+    $i->checkOption('Display on all posts');
     $i->click('.mailpoet-modal-close');
     $i->click('[data-automation-id="form_save_button"]');
     $i->waitForText('Form saved', 10, '.automation-dismissible-notices');
diff --git a/views/form/editor.html b/views/form/editor.html
index 6cce927404..1cc08c7c5f 100644
--- a/views/form/editor.html
+++ b/views/form/editor.html
@@ -78,8 +78,8 @@
   'placePopupFormOnPagesDescription': __('Display your form in a pop up window.'),
   'placeFormBellowPages': _x('Below pages', 'This is a text on a widget that leads to settings for form placement'),
   'placeFormBellowPagesDescription': __('This form placement allows you to add this form at the end of all the pages or posts, below the content.'),
-  'placeFormBellowAllPages': _x('Display on all pages', 'This is a text on a switch if a form should be displayed bellow all pages'),
-  'placeFormBellowAllPosts': _x('Display on all posts', 'This is a text on a switch if a form should be displayed bellow all posts'),
+  'placeFormOnAllPages': _x('Display on all pages', 'This is a text on a switch if a form should be displayed bellow all pages'),
+  'placeFormOnAllPosts': _x('Display on all posts', 'This is a text on a switch if a form should be displayed bellow all posts'),
   'placeFormOthers': _x('Others (widget)', 'Placement of the form using theme widget'),
   'formPlacementDelay': _x('Display with a delay of', 'Label on a selection of different times'),
   'formPlacementPlacementPosition': _x('Position', 'Placement of a fixed bar form, on top of the page or on the bottom'),