diff --git a/fhem/www/pgm2/fhemweb_iconButtons.js b/fhem/www/pgm2/fhemweb_iconButtons.js
index 5e70d3b49..62c851f13 100644
--- a/fhem/www/pgm2/fhemweb_iconButtons.js
+++ b/fhem/www/pgm2/fhemweb_iconButtons.js
@@ -36,7 +36,7 @@ FW_iconButtonsCreate(elName, devName, vArr, currVal, set, params, cmd)
     vArr[1] = vArr[1].replace(/^use4icon@|^@/,"");
   }
 
-  if( vArr[1].match(/^[A-F0-9]{6}$/,"i"))
+  if( vArr[1].match(/^[A-F0-9]{6}$/i))
     vArr[1] = "#"+vArr[1];
 
   var newEl = $("<div style='display:inline-block;'>").get(0);
@@ -81,7 +81,7 @@ FW_iconButtonsCreate(elName, devName, vArr, currVal, set, params, cmd)
     var ico = vArr[ind*ipar+3];
     var m = ico.match(/.*@(.*)/);
     var uscol = m && m[1] ? m[1] : "none";
-    if( uscol.match(/^[A-F0-9]{6}$/,"i"))
+    if( uscol.match(/^[A-F0-9]{6}$/i))
       uscol = "#"+uscol;
     if(uscol == 'none')
       ico += "@none";
@@ -145,7 +145,7 @@ FW_iconButtonsCreate(elName, devName, vArr, currVal, set, params, cmd)
                                       var span = button.next().find("span");
                                       var sc = $(span).attr("selectcolor");
                                       var usc = $(span).attr("unselectcolor") == "none" ? "" : $(span).attr("unselectcolor");
-                                      if( usc.match(/^[A-F0-9]{6}$/,"i"))
+                                      if( usc.match(/^[A-F0-9]{6}$/i))
                                         usc = "#"+usc;
                                       button.prop("checked", arg.match(new RegExp('(^|,)'+vArr[i*ipar+2]+'($|,)') ) );
                                       if (button.prop("checked")==true){
diff --git a/fhem/www/pgm2/fhemweb_iconLabel.js b/fhem/www/pgm2/fhemweb_iconLabel.js
index dbd69d822..acd46ad2d 100644
--- a/fhem/www/pgm2/fhemweb_iconLabel.js
+++ b/fhem/www/pgm2/fhemweb_iconLabel.js
@@ -66,7 +66,7 @@ FW_IconLabelCreate(elName, devName, vArr, currVal, set, params, cmd)
                                     if(ilast > 0) { //text only with color
                                       if (vArr[i+1] && vArr[i+1].indexOf("@") == 0) {
                                           col = vArr[i+1].replace(/@/,'');
-                                          if( col.match(/^[A-F0-9]{6}$/,"i"))
+                                          if( col.match(/^[A-F0-9]{6}$/i))
                                             col = "#"+col;
                                           $(newEl).find("span").html(arg+"")
                                                                .attr("style","color: "+col+" !important; padding:0.0em 0.3em ")
@@ -82,7 +82,7 @@ FW_IconLabelCreate(elName, devName, vArr, currVal, set, params, cmd)
                                           });
                                       } else if (vArr[i+1] && vArr[i+1].indexOf("@") > 0) { //text or image with color
                                           ico = vArr[i+1].split("@");
-                                          if( ico[1] && ico[1].match(/^[A-F0-9]{6}$/,"i"))
+                                          if( ico[1] && ico[1].match(/^[A-F0-9]{6}$/i))
                                             ico[1] = "#"+ico[1];
                                           FW_cmd(FW_root+"?cmd={FW_makeImage('"+vArr[i+1]+"','"+arg+"',"+(iconclass.length > 0 ? "'"+iconclass+"'" :'')+")}&XHR=1",function(data){
                                             data = data.replace(/\n$/,'');
diff --git a/fhem/www/pgm2/fhemweb_iconRadio.js b/fhem/www/pgm2/fhemweb_iconRadio.js
index fc7217b85..a300104c1 100644
--- a/fhem/www/pgm2/fhemweb_iconRadio.js
+++ b/fhem/www/pgm2/fhemweb_iconRadio.js
@@ -36,7 +36,7 @@ FW_iconRadioCreate(elName, devName, vArr, currVal, set, params, cmd)
     vArr[1] = vArr[1].replace(/^use4icon@|^@/,"");
   }
 
-  if( vArr[1].match(/^[A-F0-9]{6}$/,"i"))
+  if( vArr[1].match(/^[A-F0-9]{6}$/i))
     vArr[1] = "#"+vArr[1];
 
   var newEl = $("<div style='display:inline-block;'>").get(0);
@@ -115,7 +115,7 @@ FW_iconRadioCreate(elName, devName, vArr, currVal, set, params, cmd)
     var ico = vArr[ind*ipar+3];
     var m = ico.match(/.*@(.*)/);
     var uscol = m && m[1] ? m[1] : "none";
-    if( uscol.match(/^[A-F0-9]{6}$/,"i"))
+    if( uscol.match(/^[A-F0-9]{6}$/i))
       uscol = "#"+uscol;
     if(uscol == 'none')
       ico += "@none";
@@ -205,7 +205,7 @@ FW_iconRadioCreate(elName, devName, vArr, currVal, set, params, cmd)
                                       var span = button.next().find("span");
                                       var sc = $(span).attr("selectcolor");
                                       var usc = $(span).attr("unselectcolor") == "none" ? "" : $(span).attr("unselectcolor");
-                                      if( usc.match(/^[A-F0-9]{6}$/,"i"))
+                                      if( usc.match(/^[A-F0-9]{6}$/i))
                                         usc = "#"+usc;
                                       // console.log("setFn usc_"+i+": "+usc+": sc_"+i+": "+sc+", arg: "+arg);
                                       // console.log("setFn, i:",i,"ascd:",ascd,"istart:",istart,"iend:",iend);
diff --git a/fhem/www/pgm2/fhemweb_iconSwitch.js b/fhem/www/pgm2/fhemweb_iconSwitch.js
index b85d7d76d..602bdebf7 100644
--- a/fhem/www/pgm2/fhemweb_iconSwitch.js
+++ b/fhem/www/pgm2/fhemweb_iconSwitch.js
@@ -100,7 +100,7 @@ FW_iconSwitchCreate(elName, devName, vArr, currVal, set, params, cmd)
                                       }
                                       if (vArr[i+1] && vArr[i+1].indexOf("@") == 0) { //text only with color
                                           col = vArr[i+1].replace(/@/,'');
-                                          if( col.match(/^[A-F0-9]{6}$/,"i"))
+                                          if( col.match(/^[A-F0-9]{6}$/i))
                                             col = "#"+col;
                                           $(newEl).find("span").html(vArr[i]+"")
                                                                .attr("style","color: "+col+" !important; padding:0.0em 0.3em ")
@@ -117,7 +117,7 @@ FW_iconSwitchCreate(elName, devName, vArr, currVal, set, params, cmd)
                                           });
                                       } else if (vArr[i+1] && vArr[i+1].indexOf("@") > 0) { //text or image with color
                                           ico = vArr[i+1].split("@");
-                                          if( ico[1] && ico[1].match(/^[A-F0-9]{6}$/,"i"))
+                                          if( ico[1] && ico[1].match(/^[A-F0-9]{6}$/i))
                                             ico[1] = "#"+ico[1];
                                           FW_cmd(FW_root+"?cmd={FW_makeImage('"+vArr[i+1]+"','"+arg+"',"+(iconclass.length > 0 ? "'"+iconclass+"'" :'')+")}&XHR=1",function(data){
                                             data = data.replace(/\n$/,'');