Cleaned up back-end using message field for default icons