diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm
index 54adfc3e0..0e832f97c 100755
--- a/fhem/FHEM/01_FHEMWEB.pm
+++ b/fhem/FHEM/01_FHEMWEB.pm
@@ -2045,6 +2045,8 @@ FW_makeImage(@)
 
   $txt = $name if(!defined($txt));
   $class = "" if(!$class);
+  $class = "$class $name";
+  $class =~ s/\./_/g;
 
   my $p = FW_iconPath($name);
   return $name if(!$p);
@@ -2055,7 +2057,7 @@ FW_makeImage(@)
       close(FH);
       $data =~ s/[\r\n]/ /g;
       $data =~ s/ *$//g;
-      $data =~ s/<svg/<svg class="$class $name"/;
+      $data =~ s/<svg/<svg class="$class"/;
       $name =~ m/(@.*)$/;
       my $col = $1 if($1);
       if($col) {
diff --git a/fhem/www/pgm2/style.css b/fhem/www/pgm2/style.css
index 012dd30d2..97ed2aab6 100644
--- a/fhem/www/pgm2/style.css
+++ b/fhem/www/pgm2/style.css
@@ -57,4 +57,4 @@ select {  margin-left:5px; margin-right:5px; }
 pre { white-space: pre-wrap; }
 
 svg      { height:32px; width:32px; fill:#278727; }
-svg.on   { fill:orange; }
+svg.on,svg.FS20_on { fill:orange; }