diff --git a/fhem/FHEM/33_readingsGroup.pm b/fhem/FHEM/33_readingsGroup.pm
index d8076266b..2d64775a4 100644
--- a/fhem/FHEM/33_readingsGroup.pm
+++ b/fhem/FHEM/33_readingsGroup.pm
@@ -533,7 +533,7 @@ readingsGroup_value2html($$$$$$$$$)
   my $cmd;
   my $devStateIcon;
   if( my $value_icon = $hash->{helper}{valueIcon} ) {
-    if( my $icon = lookup($value_icon,$name,$alias,$n,$v,$room,$group,$cell_row,"") ) {
+    if( my $icon = lookup($value_icon,$name,$alias,$n,$value_orig,$room,$group,$cell_row,"") ) {
       if( $icon =~ m/^[\%\$]devStateIcon$/ ) {
         my %extPage = ();
         my ($allSets, $cmdlist, $txt) = FW_devState($name, $room, \%extPage);
@@ -541,14 +541,14 @@ readingsGroup_value2html($$$$$$$$$)
       } else {
         $devStateIcon = FW_makeImage( $icon, $v, "icon" );
         $cmd = lookup2($hash->{helper}{commands},$name,$n,$icon);
-        $cmd = lookup2($hash->{helper}{commands},$name,$n,$v) if( !$cmd );
+        $cmd = lookup2($hash->{helper}{commands},$name,$n,$value_orig) if( !$cmd );
       }
     }
   }
 
   my $webCmdFn = 0;
   if( !$devStateIcon ) {
-    $cmd = lookup2($hash->{helper}{commands},$name,$n,$v);
+    $cmd = lookup2($hash->{helper}{commands},$name,$n,$value_orig);
 
     if( $cmd && $cmd =~ m/^([\w\/.-]*):(\S*)?(\s\S*)?$/ ) {
       my $set = $1;
@@ -599,14 +599,14 @@ readingsGroup_value2html($$$$$$$$$)
   ($v,$devStateIcon) = readingsGroup_makeLink($v,$devStateIcon,$cmd) if( !$webCmdFn );
 
   if( my $value_prefix = $hash->{helper}{valuePrefix} ) {
-    if( my $value_prefix = lookup2($value_prefix,$name,$n,$v) ) {
+    if( my $value_prefix = lookup2($value_prefix,$name,$n,$value_orig) ) {
       $v = $value_prefix . $v;
       $devStateIcon = $value_prefix . $devStateIcon if( $devStateIcon );
     }
   }
 
   if( my $value_suffix = $hash->{helper}{valueSuffix} ) {
-    if( my $value_suffix = lookup2($value_suffix,$name,$n,$value_formated) ) {
+    if( my $value_suffix = lookup2($value_suffix,$name,$n,$value_orig) ) {
       $v .= $value_suffix;
       $devStateIcon .= $value_suffix if( $devStateIcon );
     }
@@ -618,7 +618,7 @@ readingsGroup_value2html($$$$$$$$$)
   $hash->{helper}{values}{formated}[$cell_column][$cell_row] = $value_formated;
   $hash->{helper}{values}{prefixsuffix}[$cell_column][$cell_row] = $value_prefix_suffix;
 
-  my $value_style = lookup2($hash->{helper}{valueStyle},$name,$n,$v,$cell_row,$cell_column);
+  my $value_style = lookup2($hash->{helper}{valueStyle},$name,$n,$value_orig,$cell_row,$cell_column);
   $v = "<div $value_style>$v</div>" if( $value_style && !$devStateIcon );
 
   return($informid,$v,$devStateIcon)