diff --git a/fhem/FHEM/Color.pm b/fhem/FHEM/Color.pm
index f52f79297..328e83dd5 100644
--- a/fhem/FHEM/Color.pm
+++ b/fhem/FHEM/Color.pm
@@ -387,10 +387,13 @@ devStateIcon($$@)
       $percent = ::Value($name);
     }
 
-    $percent =~ s/[^\d]//g if( $percent );
-
     return ".*:light_question" if( !defined($percent) );
 
+    return ".*:on:toggle" if( $percent eq "on" );
+    return ".*:off:toggle" if( $percent eq "off" );
+
+    $percent =~ s/[^\d]//g if( $percent );
+
     my $s = $dim_values{int($percent/7)};
     $s="off" if( $percent eq "0" );
     $s="on" if( $percent eq "100" );