Added icons and splitted the completion lists.