diff --git a/svyPopupFilter/forms/svyCheckPopupFilter.frm b/svyPopupFilter/forms/svyCheckPopupFilter.frm
index 464c190..2416d92 100644
--- a/svyPopupFilter/forms/svyCheckPopupFilter.frm
+++ b/svyPopupFilter/forms/svyCheckPopupFilter.frm
@@ -70,6 +70,7 @@ uuid:"007BC9DB-CAE3-473A-B54B-4CE6A4C50158"
 {
 json:{
 alignment:null,
+imageStyleClass:"fas fa-dot-circle",
 location:{
 x:1,
 y:1
@@ -79,12 +80,14 @@ size:{
 height:25,
 width:25
 },
+styleClass:"text-primary clickable",
 styleclass:"fas fa-dot-circle text-primary clickable"
 },
 location:"1,1",
 name:"radioChecked",
 size:"25,25",
-typeName:"servoyextra-fontawesome",
+styleClass:"text-primary clickable",
+typeName:"bootstrapcomponents-label",
 typeid:47,
 uuid:"F2968EC8-08E2-444E-A288-9CE3D8709585"
 }
@@ -202,6 +205,7 @@ items:[
 {
 json:{
 faclass:"fa fa-close",
+imageStyleClass:"fa fa-close",
 location:{
 x:1,
 y:1
@@ -211,12 +215,14 @@ size:{
 height:25,
 width:25
 },
+styleClass:"pull-right btn-close text-tertiary clickable",
 styleclass:"pull-right btn-close text-tertiary clickable"
 },
 location:"1,1",
 name:"faClose",
 size:"25,25",
-typeName:"servoyextra-fontawesome",
+styleClass:"pull-right btn-close text-tertiary clickable",
+typeName:"bootstrapcomponents-label",
 typeid:47,
 uuid:"636EB405-3A21-4DC3-B08F-84A13A06182D"
 }
@@ -305,6 +311,7 @@ items:[
 {
 json:{
 alignment:null,
+imageStyleClass:"fa fa-circle-o",
 location:{
 x:1,
 y:1
@@ -314,12 +321,14 @@ size:{
 height:25,
 width:25
 },
+styleClass:"text-tertiary clickable",
 styleclass:"fa fa-circle-o text-tertiary clickable"
 },
 location:"1,1",
 name:"radioUnchecked",
 size:"25,25",
-typeName:"servoyextra-fontawesome",
+styleClass:"text-tertiary clickable",
+typeName:"bootstrapcomponents-label",
 typeid:47,
 uuid:"63D429BC-AB9C-448A-9045-AD20ECDA4C54"
 },
diff --git a/svyPopupFilter/forms/svyCheckPopupFilter.js b/svyPopupFilter/forms/svyCheckPopupFilter.js
index dd09614..b26e48b 100644
--- a/svyPopupFilter/forms/svyCheckPopupFilter.js
+++ b/svyPopupFilter/forms/svyCheckPopupFilter.js
@@ -56,22 +56,25 @@ function onActionToggleUnchecked(event) {
  */
 function updateUI() {
 	
-	if (value) {
-		elements.radioChecked.styleclass = "fas fa-dot-circle text-primary clickable";
+	if (value) {		
+		elements.radioChecked.removeStyleClass("text-tertiary");
+		elements.radioChecked.addStyleClass("text-primary");
 		elements.labelChecked.removeStyleClass("text-tertiary");
 		elements.labelChecked.addStyleClass("text-primary");
 		
-		elements.radioUnchecked.styleclass = "fa fa-circle-o text-tertiary clickable"
+		elements.radioUnchecked.removeStyleClass("text-primary");
+		elements.radioUnchecked.addStyleClass("text-tertiary");
 		elements.labelUnchecked.removeStyleClass("text-primary");
 		elements.labelUnchecked.addStyleClass("text-tertiary");
 	} else {
-		elements.radioChecked.styleclass = "fa fa-circle-o text-tertiary clickable"
+		elements.radioChecked.removeStyleClass("text-primary");
+		elements.radioChecked.addStyleClass("text-tertiary");
 		elements.labelChecked.removeStyleClass("text-primary");
 		elements.labelChecked.addStyleClass("text-tertiary");
 		
-		elements.radioUnchecked.styleclass = "fas fa-dot-circle text-primary clickable";
+		elements.radioUnchecked.removeStyleClass("text-tertiary");
+		elements.radioUnchecked.addStyleClass("text-primary");
 		elements.labelUnchecked.removeStyleClass("text-tertiary");
 		elements.labelUnchecked.addStyleClass("text-primary");
 	}
-	
 }