diff --git a/classes/views/frm-forms/add_field.php b/classes/views/frm-forms/add_field.php
index c0d7e1a7ab..6db733685e 100644
--- a/classes/views/frm-forms/add_field.php
+++ b/classes/views/frm-forms/add_field.php
@@ -4,7 +4,10 @@
 }
 ?>
 <li id="frm_field_id_<?php echo esc_attr( $field['id'] ); ?>" class="<?php echo esc_attr( $li_classes ); ?>" data-fid="<?php echo esc_attr( $field['id'] ); ?>" data-formid="<?php echo esc_attr( 'divider' === $field['type'] ? $field['form_select'] : $field['form_id'] ); ?>" data-ftype="<?php echo esc_attr( $display['type'] ); ?>" data-type="<?php echo esc_attr( $field['type'] ); ?>">
-<?php if ( $field['type'] === 'divider' ) { ?>
+<?php
+if ( $field['type'] === 'divider' ) {
+	FrmAppHelper::icon_by_class( 'frmfont frm-form-title-style frm-divider-icon' );
+	?>
 <div class="divider_section_only">
 <?php } ?>
 
@@ -98,6 +101,7 @@
 </div>
 <ul class="start_divider frm_sorting frm_grid_container">
 	<?php
+	FrmAppHelper::icon_by_class( 'frmfont frm-circle frm-divider-icon' );
 } elseif ( 'end_divider' === $field['type'] ) {
 	?>
 </ul>
diff --git a/css/frm_admin.css b/css/frm_admin.css
index b0379edd35..c169c58e0f 100644
--- a/css/frm_admin.css
+++ b/css/frm_admin.css
@@ -6560,8 +6560,6 @@ li.selected .divider_section_only:before {
 	position: relative;
 }
 
-.edit_field_type_divider:before,
-.edit_field_type_divider:after,
 .frm-page-break:before,
 .frm-page-break:after {
 	content: '';
@@ -6573,30 +6571,39 @@ li.selected .divider_section_only:before {
 	-webkit-font-smoothing: antialiased;
 }
 
-.edit_field_type_divider:before {
-	font-family: 's11-fp';
-	content: '\f1dc';
-	width: 20px;
-	height: 20px;
-	left: -11px;
-	top: 0;
-	background: var(--primary-700);
-	text-align: center;
-	color: #fff;
-	font-size: 13px;
-}
-
 .repeat_section.edit_field_type_divider:before {
 	font-family: 's11-fp';
 	content: '\f363';
 }
 
-.edit_field_type_divider:after {
-	width: 5px;
-	height: 5px;
-	left: -4px;
+.edit_field_type_divider .frm-divider-icon.frmsvg {
+	padding: 2px;
+	position: absolute;
+	left: -12px;
+	color: #fff;
+	background-color: var(--primary-700);
+	border-radius: 50%;
+}
+
+.edit_field_type_divider .start_divider .frm-divider-icon.frmsvg {
+	height: 8px;
+	width: 8px;
+	padding: 0;
 	bottom: -4px;
-	transition: all 0.4s ease-out;
+	left: -24.5px;
+	color: var(--primary-700);
+	background-color: #fff;
+}
+
+.edit_field_type_divider.selected .frm-divider-icon.frmsvg,
+.edit_field_type_divider:hover .frm-divider-icon.frmsvg {
+	background: var(--primary-500);
+}
+
+.edit_field_type_divider.selected .start_divider .frm-divider-icon.frmsvg,
+.edit_field_type_divider:hover .start_divider .frm-divider-icon.frmsvg {
+	background-color: #fff;
+	color: var(--primary-500);
 }
 
 .frm-page-break:before,
@@ -6624,17 +6631,6 @@ li.selected .divider_section_only:before {
 	border-left-color: var(--primary-500);
 }
 
-.edit_field_type_divider.selected:before,
-.edit_field_type_divider:hover:before {
-	border-color: var(--primary-500);
-	background: var(--primary-500);
-}
-
-.edit_field_type_divider.selected:after,
-.edit_field_type_divider:hover:after {
-	border-color: var(--primary-500);
-}
-
 .frm-section-collapsed:after {
 	border-color: transparent !important;
 	color: transparent;