WP-3294: replacing icons..