diff --git a/mail/inc/class.mail_tree.inc.php b/mail/inc/class.mail_tree.inc.php
index ce5ff8bc6d..5e02286ba8 100644
--- a/mail/inc/class.mail_tree.inc.php
+++ b/mail/inc/class.mail_tree.inc.php
@@ -237,6 +237,7 @@ class mail_tree
 					'Sent'      => $this->ui->mail_bo->getSentFolder(false),
 					'Junk'      => $this->ui->mail_bo->getJunkFolder(false),
 					'Outbox'    => $this->ui->mail_bo->getOutboxFolder(false),
+					'Ham'		=> $this->ui->mail_bo->icServer->acc_folder_ham
 				);
 				foreach ($foldersList as &$folder)
 				{
diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 9d0aebe10b..db3bb51abf 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -972,7 +972,7 @@ class mail_ui
 					),
 					'ham' => array (
 						'caption'	=> 'Report as Ham',
-						'icon'		=> 'ham',
+						'icon'		=> 'dhtmlxtree/MailFolderHam',
 						'onExecute' => 'javaScript:app.mail.spam_actions',
 						'hint'		=> 'Report this email content as Ham (not spam) - spam solutions like spamTitan will learn',
 						'allowOnMultiple' => false
diff --git a/mail/templates/pixelegg/images/blacklist.png b/mail/templates/pixelegg/images/blacklist.png
new file mode 100644
index 0000000000..3c69e16beb
Binary files /dev/null and b/mail/templates/pixelegg/images/blacklist.png differ
diff --git a/mail/templates/pixelegg/images/spam_list_add.png b/mail/templates/pixelegg/images/spam_list_add.png
new file mode 100644
index 0000000000..d0a1514b5b
Binary files /dev/null and b/mail/templates/pixelegg/images/spam_list_add.png differ
diff --git a/mail/templates/pixelegg/images/spam_list_domain_add.png b/mail/templates/pixelegg/images/spam_list_domain_add.png
new file mode 100644
index 0000000000..3b36e868bc
Binary files /dev/null and b/mail/templates/pixelegg/images/spam_list_domain_add.png differ
diff --git a/mail/templates/pixelegg/images/spam_list_domain_remove.png b/mail/templates/pixelegg/images/spam_list_domain_remove.png
new file mode 100644
index 0000000000..918559652f
Binary files /dev/null and b/mail/templates/pixelegg/images/spam_list_domain_remove.png differ
diff --git a/mail/templates/pixelegg/images/spam_list_remove.png b/mail/templates/pixelegg/images/spam_list_remove.png
new file mode 100644
index 0000000000..ed67ff9fd3
Binary files /dev/null and b/mail/templates/pixelegg/images/spam_list_remove.png differ
diff --git a/mail/templates/pixelegg/images/whitelist.png b/mail/templates/pixelegg/images/whitelist.png
new file mode 100644
index 0000000000..3a1bb6b2e6
Binary files /dev/null and b/mail/templates/pixelegg/images/whitelist.png differ
diff --git a/pixelegg/images/dhtmlxtree/MailFolderHam.png b/pixelegg/images/dhtmlxtree/MailFolderHam.png
new file mode 100644
index 0000000000..b8ee74e30e
Binary files /dev/null and b/pixelegg/images/dhtmlxtree/MailFolderHam.png differ