diff --git a/classes/helpers/FrmStylesHelper.php b/classes/helpers/FrmStylesHelper.php
index f4f4219e87..046a5f18bf 100644
--- a/classes/helpers/FrmStylesHelper.php
+++ b/classes/helpers/FrmStylesHelper.php
@@ -879,6 +879,24 @@ public static function is_advanced_settings() {
 		return FrmAppHelper::get_param( 'section' ) === 'advanced-settings' && FrmAppHelper::get_param( 'page' ) === 'formidable-styles';
 	}
 
+	/**
+	 * Get wrapper classname for style editor sections.
+	 *
+	 * @since x.x
+	 *
+	 * @param string $section_type
+	 *
+	 * @return string The style editor wrapper classname.
+	 */
+	public static function style_editor_get_wrapper_classname( $section_type ) {
+		$is_quick_settings = ( 'quick-settings' === $section_type );
+		$classname         = 'frm-style-editor-form';
+		$classname        .= ( ! self::is_advanced_settings() xor $is_quick_settings ) ? ' frm_hidden' : '';
+		$classname        .= FrmAppHelper::pro_is_installed() ? ' frm-pro' : '';
+
+		return $classname;
+	}
+
 	/**
 	 * Retrieve the background image URL of the submit button.
 	 * It may be either a full URL string (used in versions prior to 6.14) or a numeric attachment ID (introduced in version 6.14).
diff --git a/classes/views/styles/_quick-settings.php b/classes/views/styles/_quick-settings.php
index 9e4ea9443a..f62f2baa48 100644
--- a/classes/views/styles/_quick-settings.php
+++ b/classes/views/styles/_quick-settings.php
@@ -21,13 +21,19 @@
 			'action_slug' => 'submit_bg_color',
 			'will_change' => array(
 				$frm_style->get_field_name( 'submit_bg_color' ),
-				$frm_style->get_field_name( 'slider_bar_color' ),
 				$frm_style->get_field_name( 'slider_color' ),
 				$frm_style->get_field_name( 'border_color_active' ),
 				$frm_style->get_field_name( 'submit_border_color' ),
 				$frm_style->get_field_name( 'progress_active_bg_color' ),
 				$frm_style->get_field_name( 'date_band_color' ),
 				$frm_style->get_field_name( 'date_head_bg_color' ),
+				$frm_style->get_field_name( 'toggle_on_color' ),
+				$frm_style->get_field_name( 'submit_active_border_color' ),
+				$frm_style->get_field_name( 'submit_active_bg_color' ),
+				$frm_style->get_field_name( 'submit_hover_bg_color' ),
+				$frm_style->get_field_name( 'submit_hover_border_color' ),
+				$frm_style->get_field_name( 'toggle_on_color' ),
+
 			),
 		)
 	);
diff --git a/classes/views/styles/_style-options.php b/classes/views/styles/_style-options.php
index 6f71d8d8bf..9c70402cc4 100644
--- a/classes/views/styles/_style-options.php
+++ b/classes/views/styles/_style-options.php
@@ -16,10 +16,10 @@
 	<span id="frm_style_name"><?php echo esc_html( $back_button_args['title'] ); ?></span>
 </h2>
 
-<div class="styling_settings <?php echo ! FrmStylesHelper::is_advanced_settings() ? 'frm_hidden' : ''; ?>">
+<div class="styling_settings <?php echo esc_attr( FrmStylesHelper::style_editor_get_wrapper_classname( 'advanced-settings' ) ); ?>">
 	<?php FrmStylesController::do_accordion_sections( FrmStylesController::$screen, 'side', compact( 'style', 'frm_style' ) ); ?>
 </div>
 
-<div class="frm-quick-settings frm_grid_container <?php echo FrmStylesHelper::is_advanced_settings() ? 'frm_hidden' : ''; ?>">
+<div class="frm-quick-settings frm_grid_container <?php echo esc_attr( FrmStylesHelper::style_editor_get_wrapper_classname( 'quick-settings' ) ); ?>">
 	<?php require_once FrmAppHelper::plugin_path() . '/classes/views/styles/_quick-settings.php'; ?>
 </div>
\ No newline at end of file
diff --git a/css/admin/style-components.css b/css/admin/style-components.css
index 0b935ce38e..26e3dd0394 100644
--- a/css/admin/style-components.css
+++ b/css/admin/style-components.css
@@ -17,9 +17,11 @@
 	position: relative;
 	height: 36px !important;
 	background-image: none !important;
-	background-color: white !important;
 	overflow: hidden;
 }
+.formidable_page_formidable-styles .frm-right-panel .frm-style-editor-form.frm-pro .frm-style-component .wp-picker-container button {
+	background-color: white !important;
+}
 .formidable_page_formidable-styles .frm-right-panel .frm-style-component .wp-picker-container:after {
 	content: '';
 	width: 20px;