diff -Nur kdepim-3.5.4/kmail/kmail-3.5-filter-icons.pl kdepim-3.5.4.new/kmail/kmail-3.5-filter-icons.pl
--- kdepim-3.5.4/kmail/kmail-3.5-filter-icons.pl	1970-01-01 01:00:00.000000000 +0100
+++ kdepim-3.5.4.new/kmail/kmail-3.5-filter-icons.pl	2006-08-18 15:46:03.000000000 +0200
@@ -0,0 +1,22 @@
+#!/usr/bin/perl -w
+
+use strict;
+
+# This script updates some configuration keys
+
+# read the whole config file
+my $currentGroup = "";
+my %configFile;
+while ( <> ) {
+  chomp; # eat the trailing '\n'
+  next if ( /^$/ ); # skip empty lines
+  next if ( /^\#/ ); # skip comments
+  if ( /^\[/ ) { # group begin
+    $currentGroup = $_;
+    next;
+  } elsif ( $currentGroup =~ /^\[Filter #[0-9]+\]$/ && /^Icon=/ ) {
+    my ($key,$value) = split /=/;
+    print "# DELETE $currentGroup$key\n${currentGroup}\nIcon=mail_spam\n" if $value eq "mark_as_spam";
+    print "# DELETE $currentGroup$key\n${currentGroup}\nIcon=mail_ham\n" if $value eq "mark_as_ham";
+  }
+}
diff -Nur kdepim-3.5.4/kmail/kmail.upd kdepim-3.5.4.new/kmail/kmail.upd
--- kdepim-3.5.4/kmail/kmail.upd	2006-07-22 10:14:16.000000000 +0200
+++ kdepim-3.5.4.new/kmail/kmail.upd	2006-08-18 15:47:36.000000000 +0200
@@ -158,6 +158,10 @@
 Id=3.4.1
 File=kmailrc
 Script=kmail-3.4.1-update-status-filters.pl,perl
+# Update icon names for spam/ham filters
+Id=3.5-filter-icons
+File=kmailrc
+Script=kmail-3.5-filter-icons.pl,perl
 # Remove the stored size so that we get a reasonable default now that we have 2 columns in the folder selection dialog
 Id=3.5.4
 File=kmailrc
--- kdepim-3.5.6.enterprise.0.20070824.704165/kmail/kmstartup.cpp.~1~	2007-08-24 11:47:23.061646256 +0200
+++ kdepim-3.5.6.enterprise.0.20070824.704165/kmail/kmstartup.cpp	2007-08-24 12:01:37.099020255 +0200
@@ -116,6 +116,7 @@
     "3.4a",
     "3.4b",
     "3.4.1",
+    "3.5-filter-icons",
     "3.5.4",
     "3.5.7-imap-flag-migration"
   };
--- kdepim-3.5.6.enterprise.0.20070824.704165/kmail/Makefile.am.~1~	2007-08-24 11:47:23.085647754 +0200
+++ kdepim-3.5.6.enterprise.0.20070824.704165/kmail/Makefile.am	2007-08-24 12:02:44.031203270 +0200
@@ -192,7 +192,8 @@
                 kmail-3.3b1-misc.pl \
                 kmail-3.4-misc.pl \
                 kmail-3.4.1-update-status-filters.pl \
-                kmail-3.5-trigger-flag-migration.pl
+                kmail-3.5-trigger-flag-migration.pl \
+                kmail-3.5-filter-icons.pl
 
 confdir = $(kde_confdir)
 conf_DATA = kmail.antispamrc kmail.antivirusrc